Browse Source
# Conflicts: # epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java # epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java # epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java # epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiGroupService.java # epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiGroupServiceImpl.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java # epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xmldev
wangchao
6 years ago
149 changed files with 2303 additions and 2076 deletions
@ -1,4 +1,4 @@ |
|||||
package com.epmet.common.token.dto.form; |
package com.epmet.dto.form; |
||||
|
|
||||
import lombok.Data; |
import lombok.Data; |
||||
|
|
||||
@ -0,0 +1,27 @@ |
|||||
|
package com.epmet.dto.form; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import javax.validation.constraints.NotBlank; |
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Description 政府端手机号+验证码登录接口入参 |
||||
|
* @Author yinzuomei |
||||
|
* @Date 2020/4/18 10:38 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class LoginByPhoneFormDTO extends LoginCommonFormDTO implements Serializable { |
||||
|
private static final long serialVersionUID = 4193133227120225342L; |
||||
|
|
||||
|
@NotBlank(message = "wxCode不能为空") |
||||
|
private String wxCode; |
||||
|
|
||||
|
@NotBlank(message = "手机号不能为空") |
||||
|
private String phone; |
||||
|
|
||||
|
@NotBlank(message="验证码不能为空") |
||||
|
private String smsCode; |
||||
|
|
||||
|
} |
||||
|
|
||||
@ -1,4 +1,4 @@ |
|||||
package com.epmet.common.token.dto.form; |
package com.epmet.dto.form; |
||||
|
|
||||
import lombok.Data; |
import lombok.Data; |
||||
|
|
||||
@ -1,4 +1,4 @@ |
|||||
package com.epmet.common.token.dto.form; |
package com.epmet.dto.form; |
||||
|
|
||||
import lombok.Data; |
import lombok.Data; |
||||
|
|
||||
@ -0,0 +1,19 @@ |
|||||
|
package com.epmet.dto.form; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import javax.validation.constraints.NotBlank; |
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Description 政府端手机号+验证码登录接口入参 |
||||
|
* @Author yinzuomei |
||||
|
* @Date 2020/04/18 10:26 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class SendSmsCodeFormDTO extends LoginCommonFormDTO implements Serializable { |
||||
|
private static final long serialVersionUID = -1852541457359282018L; |
||||
|
|
||||
|
@NotBlank(message = "手机号不能为空") |
||||
|
private String phone; |
||||
|
} |
||||
@ -1,4 +1,4 @@ |
|||||
package com.epmet.common.token.dto.result; |
package com.epmet.dto.result; |
||||
|
|
||||
import lombok.Data; |
import lombok.Data; |
||||
|
|
||||
@ -0,0 +1,27 @@ |
|||||
|
package com.epmet.commons.tools.validator; |
||||
|
|
||||
|
import org.apache.commons.lang3.StringUtils; |
||||
|
|
||||
|
import java.util.regex.Pattern; |
||||
|
|
||||
|
/** |
||||
|
* @Description 手机号验证工具类 |
||||
|
* @Author yinzuomei |
||||
|
* @Date 2020/4/18 15:04 |
||||
|
*/ |
||||
|
public class PhoneValidatorUtils { |
||||
|
private static final String REGEX_MOBILE ="((\\+86|0086)?\\s*)((134[0-8]\\d{7})|(((13([0-3]|[5-9]))|(14[5-9])|15([0-3]|[5-9])|(16(2|[5-7]))|17([0-3]|[5-8])|18[0-9]|19(1|[8-9]))\\d{8})|(14(0|1|4)0\\d{7})|(1740([0-5]|[6-9]|[10-12])\\d{7}))"; |
||||
|
|
||||
|
/** |
||||
|
* 判断是否是手机号 |
||||
|
* @param tel 手机号 |
||||
|
* @return boolean true:是 false:否 |
||||
|
*/ |
||||
|
public static boolean isMobile(String tel) { |
||||
|
if (StringUtils.isEmpty(tel)){ |
||||
|
return false; |
||||
|
} |
||||
|
return Pattern.matches(REGEX_MOBILE, tel); |
||||
|
} |
||||
|
} |
||||
|
|
||||
@ -1,81 +0,0 @@ |
|||||
/** |
|
||||
* Copyright 2018 人人开源 https://www.renren.io
|
|
||||
* <p> |
|
||||
* This program is free software: you can redistribute it and/or modify |
|
||||
* it under the terms of the GNU General Public License as published by |
|
||||
* the Free Software Foundation, either version 3 of the License, or |
|
||||
* (at your option) any later version. |
|
||||
* <p> |
|
||||
* This program is distributed in the hope that it will be useful, |
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||
* GNU General Public License for more details. |
|
||||
* <p> |
|
||||
* You should have received a copy of the GNU General Public License |
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||
*/ |
|
||||
|
|
||||
package com.epmet.dto; |
|
||||
|
|
||||
import java.io.Serializable; |
|
||||
import java.util.Date; |
|
||||
import lombok.Data; |
|
||||
|
|
||||
|
|
||||
/** |
|
||||
* 客户人员角色表 |
|
||||
* |
|
||||
* @author generator generator@elink-cn.com |
|
||||
* @since v1.0.0 2020-03-16 |
|
||||
*/ |
|
||||
@Data |
|
||||
public class CustomerStaffRoleDTO implements Serializable { |
|
||||
|
|
||||
private static final long serialVersionUID = 1L; |
|
||||
|
|
||||
/** |
|
||||
* ID |
|
||||
*/ |
|
||||
private String id; |
|
||||
|
|
||||
/** |
|
||||
* 用户ID |
|
||||
*/ |
|
||||
private String staffId; |
|
||||
|
|
||||
/** |
|
||||
* 角色ID |
|
||||
*/ |
|
||||
private String roleId; |
|
||||
|
|
||||
/** |
|
||||
* 删除标识 |
|
||||
*/ |
|
||||
private Integer delFlag; |
|
||||
|
|
||||
/** |
|
||||
* 乐观锁 |
|
||||
*/ |
|
||||
private Integer revision; |
|
||||
|
|
||||
/** |
|
||||
* 创建人 |
|
||||
*/ |
|
||||
private String createdBy; |
|
||||
|
|
||||
/** |
|
||||
* 创建时间 |
|
||||
*/ |
|
||||
private Date createdTime; |
|
||||
|
|
||||
/** |
|
||||
* 更新人 |
|
||||
*/ |
|
||||
private String updatedBy; |
|
||||
|
|
||||
/** |
|
||||
* 更新时间 |
|
||||
*/ |
|
||||
private Date updatedTime; |
|
||||
|
|
||||
} |
|
||||
@ -0,0 +1,13 @@ |
|||||
|
package com.epmet.dto; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.util.List; |
||||
|
|
||||
|
@Data |
||||
|
public class OrgTreeNode { |
||||
|
private String orgId; |
||||
|
private String orgName; |
||||
|
private String orgType; |
||||
|
private List<OrgTreeNode> subOrgs; |
||||
|
} |
||||
@ -1,94 +0,0 @@ |
|||||
/** |
|
||||
* Copyright 2018 人人开源 https://www.renren.io
|
|
||||
* <p> |
|
||||
* This program is free software: you can redistribute it and/or modify |
|
||||
* it under the terms of the GNU General Public License as published by |
|
||||
* the Free Software Foundation, either version 3 of the License, or |
|
||||
* (at your option) any later version. |
|
||||
* <p> |
|
||||
* This program is distributed in the hope that it will be useful, |
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||
* GNU General Public License for more details. |
|
||||
* <p> |
|
||||
* You should have received a copy of the GNU General Public License |
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||
*/ |
|
||||
|
|
||||
package com.epmet.controller; |
|
||||
|
|
||||
import com.epmet.commons.tools.page.PageData; |
|
||||
import com.epmet.commons.tools.utils.ExcelUtils; |
|
||||
import com.epmet.commons.tools.utils.Result; |
|
||||
import com.epmet.commons.tools.validator.AssertUtils; |
|
||||
import com.epmet.commons.tools.validator.ValidatorUtils; |
|
||||
import com.epmet.commons.tools.validator.group.AddGroup; |
|
||||
import com.epmet.commons.tools.validator.group.UpdateGroup; |
|
||||
import com.epmet.commons.tools.validator.group.DefaultGroup; |
|
||||
import com.epmet.dto.CustomerOrganizationDTO; |
|
||||
import com.epmet.excel.CustomerOrganizationExcel; |
|
||||
import com.epmet.service.CustomerOrganizationService; |
|
||||
import org.springframework.beans.factory.annotation.Autowired; |
|
||||
import org.springframework.web.bind.annotation.*; |
|
||||
|
|
||||
import javax.servlet.http.HttpServletResponse; |
|
||||
import java.util.List; |
|
||||
import java.util.Map; |
|
||||
|
|
||||
|
|
||||
/** |
|
||||
* 客户组织表 |
|
||||
* |
|
||||
* @author generator generator@elink-cn.com |
|
||||
* @since v1.0.0 2020-03-16 |
|
||||
*/ |
|
||||
@RestController |
|
||||
@RequestMapping("customerorganization") |
|
||||
public class CustomerOrganizationController { |
|
||||
|
|
||||
@Autowired |
|
||||
private CustomerOrganizationService customerOrganizationService; |
|
||||
|
|
||||
@GetMapping("page") |
|
||||
public Result<PageData<CustomerOrganizationDTO>> page(@RequestParam Map<String, Object> params){ |
|
||||
PageData<CustomerOrganizationDTO> page = customerOrganizationService.page(params); |
|
||||
return new Result<PageData<CustomerOrganizationDTO>>().ok(page); |
|
||||
} |
|
||||
|
|
||||
@GetMapping("{id}") |
|
||||
public Result<CustomerOrganizationDTO> get(@PathVariable("id") String id){ |
|
||||
CustomerOrganizationDTO data = customerOrganizationService.get(id); |
|
||||
return new Result<CustomerOrganizationDTO>().ok(data); |
|
||||
} |
|
||||
|
|
||||
@PostMapping |
|
||||
public Result save(@RequestBody CustomerOrganizationDTO dto){ |
|
||||
//效验数据
|
|
||||
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); |
|
||||
customerOrganizationService.save(dto); |
|
||||
return new Result(); |
|
||||
} |
|
||||
|
|
||||
@PutMapping |
|
||||
public Result update(@RequestBody CustomerOrganizationDTO dto){ |
|
||||
//效验数据
|
|
||||
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); |
|
||||
customerOrganizationService.update(dto); |
|
||||
return new Result(); |
|
||||
} |
|
||||
|
|
||||
@DeleteMapping |
|
||||
public Result delete(@RequestBody String[] ids){ |
|
||||
//效验数据
|
|
||||
AssertUtils.isArrayEmpty(ids, "id"); |
|
||||
customerOrganizationService.delete(ids); |
|
||||
return new Result(); |
|
||||
} |
|
||||
|
|
||||
@GetMapping("export") |
|
||||
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception { |
|
||||
List<CustomerOrganizationDTO> list = customerOrganizationService.list(params); |
|
||||
ExcelUtils.exportExcelToTarget(response, null, list, CustomerOrganizationExcel.class); |
|
||||
} |
|
||||
|
|
||||
} |
|
||||
@ -1,94 +0,0 @@ |
|||||
/** |
|
||||
* Copyright 2018 人人开源 https://www.renren.io
|
|
||||
* <p> |
|
||||
* This program is free software: you can redistribute it and/or modify |
|
||||
* it under the terms of the GNU General Public License as published by |
|
||||
* the Free Software Foundation, either version 3 of the License, or |
|
||||
* (at your option) any later version. |
|
||||
* <p> |
|
||||
* This program is distributed in the hope that it will be useful, |
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||
* GNU General Public License for more details. |
|
||||
* <p> |
|
||||
* You should have received a copy of the GNU General Public License |
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||
*/ |
|
||||
|
|
||||
package com.epmet.controller; |
|
||||
|
|
||||
import com.epmet.commons.tools.page.PageData; |
|
||||
import com.epmet.commons.tools.utils.ExcelUtils; |
|
||||
import com.epmet.commons.tools.utils.Result; |
|
||||
import com.epmet.commons.tools.validator.AssertUtils; |
|
||||
import com.epmet.commons.tools.validator.ValidatorUtils; |
|
||||
import com.epmet.commons.tools.validator.group.AddGroup; |
|
||||
import com.epmet.commons.tools.validator.group.UpdateGroup; |
|
||||
import com.epmet.commons.tools.validator.group.DefaultGroup; |
|
||||
import com.epmet.dto.CustomerRelevantDepartmentDTO; |
|
||||
import com.epmet.excel.CustomerRelevantDepartmentExcel; |
|
||||
import com.epmet.service.CustomerRelevantDepartmentService; |
|
||||
import org.springframework.beans.factory.annotation.Autowired; |
|
||||
import org.springframework.web.bind.annotation.*; |
|
||||
|
|
||||
import javax.servlet.http.HttpServletResponse; |
|
||||
import java.util.List; |
|
||||
import java.util.Map; |
|
||||
|
|
||||
|
|
||||
/** |
|
||||
* 客户归口部门关系表 |
|
||||
* |
|
||||
* @author generator generator@elink-cn.com |
|
||||
* @since v1.0.0 2020-03-16 |
|
||||
*/ |
|
||||
@RestController |
|
||||
@RequestMapping("customerrelevantdepartment") |
|
||||
public class CustomerRelevantDepartmentController { |
|
||||
|
|
||||
@Autowired |
|
||||
private CustomerRelevantDepartmentService customerRelevantDepartmentService; |
|
||||
|
|
||||
@GetMapping("page") |
|
||||
public Result<PageData<CustomerRelevantDepartmentDTO>> page(@RequestParam Map<String, Object> params){ |
|
||||
PageData<CustomerRelevantDepartmentDTO> page = customerRelevantDepartmentService.page(params); |
|
||||
return new Result<PageData<CustomerRelevantDepartmentDTO>>().ok(page); |
|
||||
} |
|
||||
|
|
||||
@GetMapping("{id}") |
|
||||
public Result<CustomerRelevantDepartmentDTO> get(@PathVariable("id") String id){ |
|
||||
CustomerRelevantDepartmentDTO data = customerRelevantDepartmentService.get(id); |
|
||||
return new Result<CustomerRelevantDepartmentDTO>().ok(data); |
|
||||
} |
|
||||
|
|
||||
@PostMapping |
|
||||
public Result save(@RequestBody CustomerRelevantDepartmentDTO dto){ |
|
||||
//效验数据
|
|
||||
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); |
|
||||
customerRelevantDepartmentService.save(dto); |
|
||||
return new Result(); |
|
||||
} |
|
||||
|
|
||||
@PutMapping |
|
||||
public Result update(@RequestBody CustomerRelevantDepartmentDTO dto){ |
|
||||
//效验数据
|
|
||||
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); |
|
||||
customerRelevantDepartmentService.update(dto); |
|
||||
return new Result(); |
|
||||
} |
|
||||
|
|
||||
@DeleteMapping |
|
||||
public Result delete(@RequestBody String[] ids){ |
|
||||
//效验数据
|
|
||||
AssertUtils.isArrayEmpty(ids, "id"); |
|
||||
customerRelevantDepartmentService.delete(ids); |
|
||||
return new Result(); |
|
||||
} |
|
||||
|
|
||||
@GetMapping("export") |
|
||||
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception { |
|
||||
List<CustomerRelevantDepartmentDTO> list = customerRelevantDepartmentService.list(params); |
|
||||
ExcelUtils.exportExcelToTarget(response, null, list, CustomerRelevantDepartmentExcel.class); |
|
||||
} |
|
||||
|
|
||||
} |
|
||||
@ -1,33 +0,0 @@ |
|||||
/** |
|
||||
* Copyright 2018 人人开源 https://www.renren.io
|
|
||||
* <p> |
|
||||
* This program is free software: you can redistribute it and/or modify |
|
||||
* it under the terms of the GNU General Public License as published by |
|
||||
* the Free Software Foundation, either version 3 of the License, or |
|
||||
* (at your option) any later version. |
|
||||
* <p> |
|
||||
* This program is distributed in the hope that it will be useful, |
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||
* GNU General Public License for more details. |
|
||||
* <p> |
|
||||
* You should have received a copy of the GNU General Public License |
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||
*/ |
|
||||
|
|
||||
package com.epmet.dao; |
|
||||
|
|
||||
import com.epmet.commons.mybatis.dao.BaseDao; |
|
||||
import com.epmet.entity.CustomerRelevantDepartmentEntity; |
|
||||
import org.apache.ibatis.annotations.Mapper; |
|
||||
|
|
||||
/** |
|
||||
* 客户归口部门关系表 |
|
||||
* |
|
||||
* @author generator generator@elink-cn.com |
|
||||
* @since v1.0.0 2020-03-16 |
|
||||
*/ |
|
||||
@Mapper |
|
||||
public interface CustomerRelevantDepartmentDao extends BaseDao<CustomerRelevantDepartmentEntity> { |
|
||||
|
|
||||
} |
|
||||
@ -1,51 +0,0 @@ |
|||||
/** |
|
||||
* Copyright 2018 人人开源 https://www.renren.io
|
|
||||
* <p> |
|
||||
* This program is free software: you can redistribute it and/or modify |
|
||||
* it under the terms of the GNU General Public License as published by |
|
||||
* the Free Software Foundation, either version 3 of the License, or |
|
||||
* (at your option) any later version. |
|
||||
* <p> |
|
||||
* This program is distributed in the hope that it will be useful, |
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||
* GNU General Public License for more details. |
|
||||
* <p> |
|
||||
* You should have received a copy of the GNU General Public License |
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||
*/ |
|
||||
|
|
||||
package com.epmet.entity; |
|
||||
|
|
||||
import com.baomidou.mybatisplus.annotation.TableName; |
|
||||
|
|
||||
import com.epmet.commons.mybatis.entity.BaseEpmetEntity; |
|
||||
import lombok.Data; |
|
||||
import lombok.EqualsAndHashCode; |
|
||||
|
|
||||
import java.util.Date; |
|
||||
|
|
||||
/** |
|
||||
* 客户人员角色表 |
|
||||
* |
|
||||
* @author generator generator@elink-cn.com |
|
||||
* @since v1.0.0 2020-03-16 |
|
||||
*/ |
|
||||
@Data |
|
||||
@EqualsAndHashCode(callSuper=false) |
|
||||
@TableName("customer_staff_role") |
|
||||
public class CustomerStaffRoleEntity extends BaseEpmetEntity { |
|
||||
|
|
||||
private static final long serialVersionUID = 1L; |
|
||||
|
|
||||
/** |
|
||||
* 用户ID |
|
||||
*/ |
|
||||
private String staffId; |
|
||||
|
|
||||
/** |
|
||||
* 角色ID |
|
||||
*/ |
|
||||
private String roleId; |
|
||||
|
|
||||
} |
|
||||
@ -1,62 +0,0 @@ |
|||||
/** |
|
||||
* Copyright 2018 人人开源 https://www.renren.io
|
|
||||
* <p> |
|
||||
* This program is free software: you can redistribute it and/or modify |
|
||||
* it under the terms of the GNU General Public License as published by |
|
||||
* the Free Software Foundation, either version 3 of the License, or |
|
||||
* (at your option) any later version. |
|
||||
* <p> |
|
||||
* This program is distributed in the hope that it will be useful, |
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||
* GNU General Public License for more details. |
|
||||
* <p> |
|
||||
* You should have received a copy of the GNU General Public License |
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||
*/ |
|
||||
|
|
||||
package com.epmet.excel; |
|
||||
|
|
||||
import cn.afterturn.easypoi.excel.annotation.Excel; |
|
||||
import lombok.Data; |
|
||||
|
|
||||
import java.util.Date; |
|
||||
|
|
||||
/** |
|
||||
* 客户归口部门关系表 |
|
||||
* |
|
||||
* @author generator generator@elink-cn.com |
|
||||
* @since v1.0.0 2020-03-16 |
|
||||
*/ |
|
||||
@Data |
|
||||
public class CustomerRelevantDepartmentExcel { |
|
||||
|
|
||||
@Excel(name = "ID") |
|
||||
private String id; |
|
||||
|
|
||||
@Excel(name = "部门ID") |
|
||||
private String departmentId; |
|
||||
|
|
||||
@Excel(name = "归口部门ID") |
|
||||
private String relevantDepartmentId; |
|
||||
|
|
||||
@Excel(name = "删除标识") |
|
||||
private Integer delFlag; |
|
||||
|
|
||||
@Excel(name = "乐观锁") |
|
||||
private Integer revision; |
|
||||
|
|
||||
@Excel(name = "创建人") |
|
||||
private String createdBy; |
|
||||
|
|
||||
@Excel(name = "创建时间") |
|
||||
private Date createdTime; |
|
||||
|
|
||||
@Excel(name = "更新人") |
|
||||
private String updatedBy; |
|
||||
|
|
||||
@Excel(name = "更新时间") |
|
||||
private Date updatedTime; |
|
||||
|
|
||||
|
|
||||
} |
|
||||
@ -1,62 +0,0 @@ |
|||||
/** |
|
||||
* Copyright 2018 人人开源 https://www.renren.io
|
|
||||
* <p> |
|
||||
* This program is free software: you can redistribute it and/or modify |
|
||||
* it under the terms of the GNU General Public License as published by |
|
||||
* the Free Software Foundation, either version 3 of the License, or |
|
||||
* (at your option) any later version. |
|
||||
* <p> |
|
||||
* This program is distributed in the hope that it will be useful, |
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||
* GNU General Public License for more details. |
|
||||
* <p> |
|
||||
* You should have received a copy of the GNU General Public License |
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||
*/ |
|
||||
|
|
||||
package com.epmet.excel; |
|
||||
|
|
||||
import cn.afterturn.easypoi.excel.annotation.Excel; |
|
||||
import lombok.Data; |
|
||||
|
|
||||
import java.util.Date; |
|
||||
|
|
||||
/** |
|
||||
* 客户人员角色表 |
|
||||
* |
|
||||
* @author generator generator@elink-cn.com |
|
||||
* @since v1.0.0 2020-03-16 |
|
||||
*/ |
|
||||
@Data |
|
||||
public class CustomerStaffRoleExcel { |
|
||||
|
|
||||
@Excel(name = "ID") |
|
||||
private String id; |
|
||||
|
|
||||
@Excel(name = "用户ID") |
|
||||
private String staffId; |
|
||||
|
|
||||
@Excel(name = "角色ID") |
|
||||
private String roleId; |
|
||||
|
|
||||
@Excel(name = "删除标识") |
|
||||
private Integer delFlag; |
|
||||
|
|
||||
@Excel(name = "乐观锁") |
|
||||
private Integer revision; |
|
||||
|
|
||||
@Excel(name = "创建人") |
|
||||
private String createdBy; |
|
||||
|
|
||||
@Excel(name = "创建时间") |
|
||||
private Date createdTime; |
|
||||
|
|
||||
@Excel(name = "更新人") |
|
||||
private String updatedBy; |
|
||||
|
|
||||
@Excel(name = "更新时间") |
|
||||
private Date updatedTime; |
|
||||
|
|
||||
|
|
||||
} |
|
||||
@ -1,25 +0,0 @@ |
|||||
package com.epmet.feign; |
|
||||
|
|
||||
import com.epmet.commons.tools.constant.ServiceConstant; |
|
||||
import com.epmet.commons.tools.utils.Result; |
|
||||
import com.epmet.feign.fallback.ResiPartymemberFeignClientFallBack; |
|
||||
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO; |
|
||||
import org.springframework.cloud.openfeign.FeignClient; |
|
||||
import org.springframework.web.bind.annotation.PostMapping; |
|
||||
|
|
||||
/** |
|
||||
* @Description 政府端工作人员审核 |
|
||||
* @Author sun |
|
||||
*/ |
|
||||
@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartymemberFeignClientFallBack.class) |
|
||||
public interface ResiPartymemberFeignClient { |
|
||||
|
|
||||
/** |
|
||||
* @Author sun |
|
||||
* @Description 政府端-热心居民申请人工审核 |
|
||||
**/ |
|
||||
@PostMapping(value = "resi/partymember/resiwarmheartedapply/manageaudit") |
|
||||
Result manageAudit(ResiWarmheartedAuditFormDTO formDTO); |
|
||||
|
|
||||
|
|
||||
} |
|
||||
@ -1,21 +0,0 @@ |
|||||
package com.epmet.feign.fallback; |
|
||||
|
|
||||
import com.epmet.commons.tools.constant.ServiceConstant; |
|
||||
import com.epmet.commons.tools.utils.ModuleUtils; |
|
||||
import com.epmet.commons.tools.utils.Result; |
|
||||
import com.epmet.feign.ResiPartymemberFeignClient; |
|
||||
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO; |
|
||||
import org.springframework.stereotype.Component; |
|
||||
|
|
||||
/** |
|
||||
* @Description 政府端工作人员审核 |
|
||||
* @Author sun |
|
||||
*/ |
|
||||
@Component |
|
||||
public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignClient { |
|
||||
|
|
||||
@Override |
|
||||
public Result manageAudit(ResiWarmheartedAuditFormDTO formDTO) { |
|
||||
return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "manageAudit", formDTO); |
|
||||
} |
|
||||
} |
|
||||
@ -1,47 +0,0 @@ |
|||||
/** |
|
||||
* Copyright 2018 人人开源 https://www.renren.io
|
|
||||
* <p> |
|
||||
* This program is free software: you can redistribute it and/or modify |
|
||||
* it under the terms of the GNU General Public License as published by |
|
||||
* the Free Software Foundation, either version 3 of the License, or |
|
||||
* (at your option) any later version. |
|
||||
* <p> |
|
||||
* This program is distributed in the hope that it will be useful, |
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||
* GNU General Public License for more details. |
|
||||
* <p> |
|
||||
* You should have received a copy of the GNU General Public License |
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||
*/ |
|
||||
|
|
||||
package com.epmet.redis; |
|
||||
|
|
||||
import com.epmet.commons.tools.redis.RedisUtils; |
|
||||
import org.springframework.beans.factory.annotation.Autowired; |
|
||||
import org.springframework.stereotype.Component; |
|
||||
|
|
||||
/** |
|
||||
* 客户归口部门关系表 |
|
||||
* |
|
||||
* @author generator generator@elink-cn.com |
|
||||
* @since v1.0.0 2020-03-16 |
|
||||
*/ |
|
||||
@Component |
|
||||
public class CustomerRelevantDepartmentRedis { |
|
||||
@Autowired |
|
||||
private RedisUtils redisUtils; |
|
||||
|
|
||||
public void delete(Object[] ids) { |
|
||||
|
|
||||
} |
|
||||
|
|
||||
public void set(){ |
|
||||
|
|
||||
} |
|
||||
|
|
||||
public String get(String id){ |
|
||||
return null; |
|
||||
} |
|
||||
|
|
||||
} |
|
||||
@ -1,47 +0,0 @@ |
|||||
/** |
|
||||
* Copyright 2018 人人开源 https://www.renren.io
|
|
||||
* <p> |
|
||||
* This program is free software: you can redistribute it and/or modify |
|
||||
* it under the terms of the GNU General Public License as published by |
|
||||
* the Free Software Foundation, either version 3 of the License, or |
|
||||
* (at your option) any later version. |
|
||||
* <p> |
|
||||
* This program is distributed in the hope that it will be useful, |
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||
* GNU General Public License for more details. |
|
||||
* <p> |
|
||||
* You should have received a copy of the GNU General Public License |
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||
*/ |
|
||||
|
|
||||
package com.epmet.redis; |
|
||||
|
|
||||
import com.epmet.commons.tools.redis.RedisUtils; |
|
||||
import org.springframework.beans.factory.annotation.Autowired; |
|
||||
import org.springframework.stereotype.Component; |
|
||||
|
|
||||
/** |
|
||||
* 客户人员组织表 |
|
||||
* |
|
||||
* @author generator generator@elink-cn.com |
|
||||
* @since v1.0.0 2020-03-16 |
|
||||
*/ |
|
||||
@Component |
|
||||
public class CustomerStaffOrganizationRedis { |
|
||||
@Autowired |
|
||||
private RedisUtils redisUtils; |
|
||||
|
|
||||
public void delete(Object[] ids) { |
|
||||
|
|
||||
} |
|
||||
|
|
||||
public void set(){ |
|
||||
|
|
||||
} |
|
||||
|
|
||||
public String get(String id){ |
|
||||
return null; |
|
||||
} |
|
||||
|
|
||||
} |
|
||||
@ -1,95 +0,0 @@ |
|||||
/** |
|
||||
* Copyright 2018 人人开源 https://www.renren.io
|
|
||||
* <p> |
|
||||
* This program is free software: you can redistribute it and/or modify |
|
||||
* it under the terms of the GNU General Public License as published by |
|
||||
* the Free Software Foundation, either version 3 of the License, or |
|
||||
* (at your option) any later version. |
|
||||
* <p> |
|
||||
* This program is distributed in the hope that it will be useful, |
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||
* GNU General Public License for more details. |
|
||||
* <p> |
|
||||
* You should have received a copy of the GNU General Public License |
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||
*/ |
|
||||
|
|
||||
package com.epmet.service; |
|
||||
|
|
||||
import com.epmet.commons.mybatis.service.BaseService; |
|
||||
import com.epmet.commons.tools.page.PageData; |
|
||||
import com.epmet.dto.CustomerStaffOrganizationDTO; |
|
||||
import com.epmet.entity.CustomerStaffOrganizationEntity; |
|
||||
|
|
||||
import java.util.List; |
|
||||
import java.util.Map; |
|
||||
|
|
||||
/** |
|
||||
* 客户人员组织表 |
|
||||
* |
|
||||
* @author generator generator@elink-cn.com |
|
||||
* @since v1.0.0 2020-03-16 |
|
||||
*/ |
|
||||
public interface CustomerStaffOrganizationService extends BaseService<CustomerStaffOrganizationEntity> { |
|
||||
|
|
||||
/** |
|
||||
* 默认分页 |
|
||||
* |
|
||||
* @param params |
|
||||
* @return PageData<CustomerStaffOrganizationDTO> |
|
||||
* @author generator |
|
||||
* @date 2020-03-16 |
|
||||
*/ |
|
||||
PageData<CustomerStaffOrganizationDTO> page(Map<String, Object> params); |
|
||||
|
|
||||
/** |
|
||||
* 默认查询 |
|
||||
* |
|
||||
* @param params |
|
||||
* @return java.util.List<CustomerStaffOrganizationDTO> |
|
||||
* @author generator |
|
||||
* @date 2020-03-16 |
|
||||
*/ |
|
||||
List<CustomerStaffOrganizationDTO> list(Map<String, Object> params); |
|
||||
|
|
||||
/** |
|
||||
* 单条查询 |
|
||||
* |
|
||||
* @param id |
|
||||
* @return CustomerStaffOrganizationDTO |
|
||||
* @author generator |
|
||||
* @date 2020-03-16 |
|
||||
*/ |
|
||||
CustomerStaffOrganizationDTO get(String id); |
|
||||
|
|
||||
/** |
|
||||
* 默认保存 |
|
||||
* |
|
||||
* @param dto |
|
||||
* @return void |
|
||||
* @author generator |
|
||||
* @date 2020-03-16 |
|
||||
*/ |
|
||||
void save(CustomerStaffOrganizationDTO dto); |
|
||||
|
|
||||
/** |
|
||||
* 默认更新 |
|
||||
* |
|
||||
* @param dto |
|
||||
* @return void |
|
||||
* @author generator |
|
||||
* @date 2020-03-16 |
|
||||
*/ |
|
||||
void update(CustomerStaffOrganizationDTO dto); |
|
||||
|
|
||||
/** |
|
||||
* 批量删除 |
|
||||
* |
|
||||
* @param ids |
|
||||
* @return void |
|
||||
* @author generator |
|
||||
* @date 2020-03-16 |
|
||||
*/ |
|
||||
void delete(String[] ids); |
|
||||
} |
|
||||
@ -1,104 +0,0 @@ |
|||||
/** |
|
||||
* Copyright 2018 人人开源 https://www.renren.io
|
|
||||
* <p> |
|
||||
* This program is free software: you can redistribute it and/or modify |
|
||||
* it under the terms of the GNU General Public License as published by |
|
||||
* the Free Software Foundation, either version 3 of the License, or |
|
||||
* (at your option) any later version. |
|
||||
* <p> |
|
||||
* This program is distributed in the hope that it will be useful, |
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||
* GNU General Public License for more details. |
|
||||
* <p> |
|
||||
* You should have received a copy of the GNU General Public License |
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||
*/ |
|
||||
|
|
||||
package com.epmet.service.impl; |
|
||||
|
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
||||
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; |
|
||||
import com.epmet.commons.tools.page.PageData; |
|
||||
import com.epmet.commons.tools.utils.ConvertUtils; |
|
||||
import com.epmet.commons.tools.constant.FieldConstant; |
|
||||
import com.epmet.dao.CustomerOrganizationDao; |
|
||||
import com.epmet.dto.CustomerOrganizationDTO; |
|
||||
import com.epmet.entity.CustomerOrganizationEntity; |
|
||||
import com.epmet.redis.CustomerOrganizationRedis; |
|
||||
import com.epmet.service.CustomerOrganizationService; |
|
||||
import org.apache.commons.lang3.StringUtils; |
|
||||
import org.springframework.beans.factory.annotation.Autowired; |
|
||||
import org.springframework.stereotype.Service; |
|
||||
import org.springframework.transaction.annotation.Transactional; |
|
||||
|
|
||||
import java.util.Arrays; |
|
||||
import java.util.List; |
|
||||
import java.util.Map; |
|
||||
|
|
||||
/** |
|
||||
* 客户组织表 |
|
||||
* |
|
||||
* @author generator generator@elink-cn.com |
|
||||
* @since v1.0.0 2020-03-16 |
|
||||
*/ |
|
||||
@Service |
|
||||
public class CustomerOrganizationServiceImpl extends BaseServiceImpl<CustomerOrganizationDao, CustomerOrganizationEntity> implements CustomerOrganizationService { |
|
||||
|
|
||||
@Autowired |
|
||||
private CustomerOrganizationRedis customerOrganizationRedis; |
|
||||
|
|
||||
@Override |
|
||||
public PageData<CustomerOrganizationDTO> page(Map<String, Object> params) { |
|
||||
IPage<CustomerOrganizationEntity> page = baseDao.selectPage( |
|
||||
getPage(params, FieldConstant.CREATED_TIME, false), |
|
||||
getWrapper(params) |
|
||||
); |
|
||||
return getPageData(page, CustomerOrganizationDTO.class); |
|
||||
} |
|
||||
|
|
||||
@Override |
|
||||
public List<CustomerOrganizationDTO> list(Map<String, Object> params) { |
|
||||
List<CustomerOrganizationEntity> entityList = baseDao.selectList(getWrapper(params)); |
|
||||
|
|
||||
return ConvertUtils.sourceToTarget(entityList, CustomerOrganizationDTO.class); |
|
||||
} |
|
||||
|
|
||||
private QueryWrapper<CustomerOrganizationEntity> getWrapper(Map<String, Object> params){ |
|
||||
String id = (String)params.get(FieldConstant.ID_HUMP); |
|
||||
|
|
||||
QueryWrapper<CustomerOrganizationEntity> wrapper = new QueryWrapper<>(); |
|
||||
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); |
|
||||
|
|
||||
return wrapper; |
|
||||
} |
|
||||
|
|
||||
@Override |
|
||||
public CustomerOrganizationDTO get(String id) { |
|
||||
CustomerOrganizationEntity entity = baseDao.selectById(id); |
|
||||
return ConvertUtils.sourceToTarget(entity, CustomerOrganizationDTO.class); |
|
||||
} |
|
||||
|
|
||||
@Override |
|
||||
@Transactional(rollbackFor = Exception.class) |
|
||||
public void save(CustomerOrganizationDTO dto) { |
|
||||
CustomerOrganizationEntity entity = ConvertUtils.sourceToTarget(dto, CustomerOrganizationEntity.class); |
|
||||
insert(entity); |
|
||||
} |
|
||||
|
|
||||
@Override |
|
||||
@Transactional(rollbackFor = Exception.class) |
|
||||
public void update(CustomerOrganizationDTO dto) { |
|
||||
CustomerOrganizationEntity entity = ConvertUtils.sourceToTarget(dto, CustomerOrganizationEntity.class); |
|
||||
updateById(entity); |
|
||||
} |
|
||||
|
|
||||
@Override |
|
||||
@Transactional(rollbackFor = Exception.class) |
|
||||
public void delete(String[] ids) { |
|
||||
// 逻辑删除（@TableLogic 注解）
|
|
||||
baseDao.deleteBatchIds(Arrays.asList(ids)); |
|
||||
} |
|
||||
|
|
||||
} |
|
||||
@ -1,104 +0,0 @@ |
|||||
/** |
|
||||
* Copyright 2018 人人开源 https://www.renren.io
|
|
||||
* <p> |
|
||||
* This program is free software: you can redistribute it and/or modify |
|
||||
* it under the terms of the GNU General Public License as published by |
|
||||
* the Free Software Foundation, either version 3 of the License, or |
|
||||
* (at your option) any later version. |
|
||||
* <p> |
|
||||
* This program is distributed in the hope that it will be useful, |
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||
* GNU General Public License for more details. |
|
||||
* <p> |
|
||||
* You should have received a copy of the GNU General Public License |
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||
*/ |
|
||||
|
|
||||
package com.epmet.service.impl; |
|
||||
|
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
||||
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; |
|
||||
import com.epmet.commons.tools.page.PageData; |
|
||||
import com.epmet.commons.tools.utils.ConvertUtils; |
|
||||
import com.epmet.commons.tools.constant.FieldConstant; |
|
||||
import com.epmet.dao.CustomerRelevantDepartmentDao; |
|
||||
import com.epmet.dto.CustomerRelevantDepartmentDTO; |
|
||||
import com.epmet.entity.CustomerRelevantDepartmentEntity; |
|
||||
import com.epmet.redis.CustomerRelevantDepartmentRedis; |
|
||||
import com.epmet.service.CustomerRelevantDepartmentService; |
|
||||
import org.apache.commons.lang3.StringUtils; |
|
||||
import org.springframework.beans.factory.annotation.Autowired; |
|
||||
import org.springframework.stereotype.Service; |
|
||||
import org.springframework.transaction.annotation.Transactional; |
|
||||
|
|
||||
import java.util.Arrays; |
|
||||
import java.util.List; |
|
||||
import java.util.Map; |
|
||||
|
|
||||
/** |
|
||||
* 客户归口部门关系表 |
|
||||
* |
|
||||
* @author generator generator@elink-cn.com |
|
||||
* @since v1.0.0 2020-03-16 |
|
||||
*/ |
|
||||
@Service |
|
||||
public class CustomerRelevantDepartmentServiceImpl extends BaseServiceImpl<CustomerRelevantDepartmentDao, CustomerRelevantDepartmentEntity> implements CustomerRelevantDepartmentService { |
|
||||
|
|
||||
@Autowired |
|
||||
private CustomerRelevantDepartmentRedis customerRelevantDepartmentRedis; |
|
||||
|
|
||||
@Override |
|
||||
public PageData<CustomerRelevantDepartmentDTO> page(Map<String, Object> params) { |
|
||||
IPage<CustomerRelevantDepartmentEntity> page = baseDao.selectPage( |
|
||||
getPage(params, FieldConstant.CREATED_TIME, false), |
|
||||
getWrapper(params) |
|
||||
); |
|
||||
return getPageData(page, CustomerRelevantDepartmentDTO.class); |
|
||||
} |
|
||||
|
|
||||
@Override |
|
||||
public List<CustomerRelevantDepartmentDTO> list(Map<String, Object> params) { |
|
||||
List<CustomerRelevantDepartmentEntity> entityList = baseDao.selectList(getWrapper(params)); |
|
||||
|
|
||||
return ConvertUtils.sourceToTarget(entityList, CustomerRelevantDepartmentDTO.class); |
|
||||
} |
|
||||
|
|
||||
private QueryWrapper<CustomerRelevantDepartmentEntity> getWrapper(Map<String, Object> params){ |
|
||||
String id = (String)params.get(FieldConstant.ID_HUMP); |
|
||||
|
|
||||
QueryWrapper<CustomerRelevantDepartmentEntity> wrapper = new QueryWrapper<>(); |
|
||||
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); |
|
||||
|
|
||||
return wrapper; |
|
||||
} |
|
||||
|
|
||||
@Override |
|
||||
public CustomerRelevantDepartmentDTO get(String id) { |
|
||||
CustomerRelevantDepartmentEntity entity = baseDao.selectById(id); |
|
||||
return ConvertUtils.sourceToTarget(entity, CustomerRelevantDepartmentDTO.class); |
|
||||
} |
|
||||
|
|
||||
@Override |
|
||||
@Transactional(rollbackFor = Exception.class) |
|
||||
public void save(CustomerRelevantDepartmentDTO dto) { |
|
||||
CustomerRelevantDepartmentEntity entity = ConvertUtils.sourceToTarget(dto, CustomerRelevantDepartmentEntity.class); |
|
||||
insert(entity); |
|
||||
} |
|
||||
|
|
||||
@Override |
|
||||
@Transactional(rollbackFor = Exception.class) |
|
||||
public void update(CustomerRelevantDepartmentDTO dto) { |
|
||||
CustomerRelevantDepartmentEntity entity = ConvertUtils.sourceToTarget(dto, CustomerRelevantDepartmentEntity.class); |
|
||||
updateById(entity); |
|
||||
} |
|
||||
|
|
||||
@Override |
|
||||
@Transactional(rollbackFor = Exception.class) |
|
||||
public void delete(String[] ids) { |
|
||||
// 逻辑删除（@TableLogic 注解）
|
|
||||
baseDao.deleteBatchIds(Arrays.asList(ids)); |
|
||||
} |
|
||||
|
|
||||
} |
|
||||
@ -1,104 +0,0 @@ |
|||||
/** |
|
||||
* Copyright 2018 人人开源 https://www.renren.io
|
|
||||
* <p> |
|
||||
* This program is free software: you can redistribute it and/or modify |
|
||||
* it under the terms of the GNU General Public License as published by |
|
||||
* the Free Software Foundation, either version 3 of the License, or |
|
||||
* (at your option) any later version. |
|
||||
* <p> |
|
||||
* This program is distributed in the hope that it will be useful, |
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||
* GNU General Public License for more details. |
|
||||
* <p> |
|
||||
* You should have received a copy of the GNU General Public License |
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||
*/ |
|
||||
|
|
||||
package com.epmet.service.impl; |
|
||||
|
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
||||
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; |
|
||||
import com.epmet.commons.tools.page.PageData; |
|
||||
import com.epmet.commons.tools.utils.ConvertUtils; |
|
||||
import com.epmet.commons.tools.constant.FieldConstant; |
|
||||
import com.epmet.dao.CustomerStaffOrganizationDao; |
|
||||
import com.epmet.dto.CustomerStaffOrganizationDTO; |
|
||||
import com.epmet.entity.CustomerStaffOrganizationEntity; |
|
||||
import com.epmet.redis.CustomerStaffOrganizationRedis; |
|
||||
import com.epmet.service.CustomerStaffOrganizationService; |
|
||||
import org.apache.commons.lang3.StringUtils; |
|
||||
import org.springframework.beans.factory.annotation.Autowired; |
|
||||
import org.springframework.stereotype.Service; |
|
||||
import org.springframework.transaction.annotation.Transactional; |
|
||||
|
|
||||
import java.util.Arrays; |
|
||||
import java.util.List; |
|
||||
import java.util.Map; |
|
||||
|
|
||||
/** |
|
||||
* 客户人员组织表 |
|
||||
* |
|
||||
* @author generator generator@elink-cn.com |
|
||||
* @since v1.0.0 2020-03-16 |
|
||||
*/ |
|
||||
@Service |
|
||||
public class CustomerStaffOrganizationServiceImpl extends BaseServiceImpl<CustomerStaffOrganizationDao, CustomerStaffOrganizationEntity> implements CustomerStaffOrganizationService { |
|
||||
|
|
||||
@Autowired |
|
||||
private CustomerStaffOrganizationRedis customerStaffOrganizationRedis; |
|
||||
|
|
||||
@Override |
|
||||
public PageData<CustomerStaffOrganizationDTO> page(Map<String, Object> params) { |
|
||||
IPage<CustomerStaffOrganizationEntity> page = baseDao.selectPage( |
|
||||
getPage(params, FieldConstant.CREATED_TIME, false), |
|
||||
getWrapper(params) |
|
||||
); |
|
||||
return getPageData(page, CustomerStaffOrganizationDTO.class); |
|
||||
} |
|
||||
|
|
||||
@Override |
|
||||
public List<CustomerStaffOrganizationDTO> list(Map<String, Object> params) { |
|
||||
List<CustomerStaffOrganizationEntity> entityList = baseDao.selectList(getWrapper(params)); |
|
||||
|
|
||||
return ConvertUtils.sourceToTarget(entityList, CustomerStaffOrganizationDTO.class); |
|
||||
} |
|
||||
|
|
||||
private QueryWrapper<CustomerStaffOrganizationEntity> getWrapper(Map<String, Object> params){ |
|
||||
String id = (String)params.get(FieldConstant.ID_HUMP); |
|
||||
|
|
||||
QueryWrapper<CustomerStaffOrganizationEntity> wrapper = new QueryWrapper<>(); |
|
||||
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); |
|
||||
|
|
||||
return wrapper; |
|
||||
} |
|
||||
|
|
||||
@Override |
|
||||
public CustomerStaffOrganizationDTO get(String id) { |
|
||||
CustomerStaffOrganizationEntity entity = baseDao.selectById(id); |
|
||||
return ConvertUtils.sourceToTarget(entity, CustomerStaffOrganizationDTO.class); |
|
||||
} |
|
||||
|
|
||||
@Override |
|
||||
@Transactional(rollbackFor = Exception.class) |
|
||||
public void save(CustomerStaffOrganizationDTO dto) { |
|
||||
CustomerStaffOrganizationEntity entity = ConvertUtils.sourceToTarget(dto, CustomerStaffOrganizationEntity.class); |
|
||||
insert(entity); |
|
||||
} |
|
||||
|
|
||||
@Override |
|
||||
@Transactional(rollbackFor = Exception.class) |
|
||||
public void update(CustomerStaffOrganizationDTO dto) { |
|
||||
CustomerStaffOrganizationEntity entity = ConvertUtils.sourceToTarget(dto, CustomerStaffOrganizationEntity.class); |
|
||||
updateById(entity); |
|
||||
} |
|
||||
|
|
||||
@Override |
|
||||
@Transactional(rollbackFor = Exception.class) |
|
||||
public void delete(String[] ids) { |
|
||||
// 逻辑删除（@TableLogic 注解）
|
|
||||
baseDao.deleteBatchIds(Arrays.asList(ids)); |
|
||||
} |
|
||||
|
|
||||
} |
|
||||
@ -0,0 +1,108 @@ |
|||||
|
DROP TABLE IF EXISTS `customer_department`; |
||||
|
CREATE TABLE `customer_department` ( |
||||
|
`ID` varchar(64) NOT NULL COMMENT 'ID 唯一标识', |
||||
|
`CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', |
||||
|
`ORG_ID` varchar(64) NOT NULL COMMENT '所属组织机构ID（customer_organization.id）', |
||||
|
`DEPARTMENT_NAME` varchar(128) NOT NULL COMMENT '部门名称', |
||||
|
`DEPARTMENT_DUTY` varchar(255) NOT NULL COMMENT '部门职责', |
||||
|
`TOTAL_USER` int(11) NOT NULL COMMENT '总人数', |
||||
|
`DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识:0.未删除 1.已删除', |
||||
|
`REVISION` int(10) NOT NULL COMMENT '乐观锁', |
||||
|
`CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', |
||||
|
`CREATED_TIME` datetime NOT NULL COMMENT '创建时间', |
||||
|
`UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', |
||||
|
`UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', |
||||
|
PRIMARY KEY (`ID`) |
||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='客户部门表 '; |
||||
|
-- ----------------------------------------------------------------------- |
||||
|
-- ----------------------------------------------------------------------- |
||||
|
DROP TABLE IF EXISTS `customer_organization`; |
||||
|
CREATE TABLE `customer_organization` ( |
||||
|
`ID` varchar(64) NOT NULL COMMENT 'ID', |
||||
|
`CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', |
||||
|
`PID` varchar(64) NOT NULL COMMENT '上级组织机构ID', |
||||
|
`PIDS` varchar(1024) NOT NULL COMMENT '所有上级组织机构ID(以英文:隔开)', |
||||
|
`ALL_PARENT_NAME` varchar(1024) DEFAULT NULL COMMENT '所有上级名称,以-连接', |
||||
|
`ORGANIZATION_NAME` varchar(64) NOT NULL COMMENT '组织名称', |
||||
|
`LEVEL` int(10) NOT NULL COMMENT '机关级别（社区级：community，\r\n乡（镇、街道）级:street,\r\n区县级: district,\r\n市级: city\r\n省级:province） 机关级别（社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province）', |
||||
|
`AREA_CODE` int(10) NOT NULL COMMENT '地区编码', |
||||
|
`DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识', |
||||
|
`REVISION` int(10) NOT NULL COMMENT '乐观锁', |
||||
|
`CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', |
||||
|
`CREATED_TIME` datetime NOT NULL COMMENT '创建时间', |
||||
|
`UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', |
||||
|
`UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', |
||||
|
`TOTAL_USER` int(11) DEFAULT NULL COMMENT '总人数', |
||||
|
PRIMARY KEY (`ID`) |
||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='组织机构表 '; |
||||
|
-- ----------------------------------------------------------------------- |
||||
|
-- ----------------------------------------------------------------------- |
||||
|
DROP TABLE IF EXISTS `customer_staff_department`; |
||||
|
CREATE TABLE `customer_staff_department` ( |
||||
|
`ID` varchar(64) NOT NULL COMMENT 'ID', |
||||
|
`CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', |
||||
|
`USER_ID` varchar(64) NOT NULL COMMENT '用户ID', |
||||
|
`DEPARTMENT_ID` varchar(64) NOT NULL COMMENT '部门ID customer_department.id', |
||||
|
`DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识', |
||||
|
`REVISION` int(10) NOT NULL COMMENT '乐观锁', |
||||
|
`CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', |
||||
|
`CREATED_TIME` datetime NOT NULL COMMENT '创建时间', |
||||
|
`UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', |
||||
|
`UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', |
||||
|
PRIMARY KEY (`ID`) |
||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='部门人员关系表 '; |
||||
|
|
||||
|
-- ----------------------------------------------------------------------- |
||||
|
-- ----------------------------------------------------------------------- |
||||
|
DROP TABLE IF EXISTS `customer_staff_grid`; |
||||
|
CREATE TABLE `customer_staff_grid` ( |
||||
|
`ID` varchar(64) NOT NULL COMMENT 'ID', |
||||
|
`USER_ID` varchar(64) NOT NULL COMMENT '用户id, user.id', |
||||
|
`GRID_ID` varchar(64) NOT NULL COMMENT '网格ID customer_grid.id', |
||||
|
`CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', |
||||
|
`DEL_FLAG` int(10) NOT NULL COMMENT '删除标识', |
||||
|
`REVISION` int(10) NOT NULL COMMENT '乐观锁', |
||||
|
`CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', |
||||
|
`CREATED_TIME` datetime NOT NULL COMMENT '创建时间', |
||||
|
`UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', |
||||
|
`UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', |
||||
|
PRIMARY KEY (`ID`) |
||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='网格人员关系表 '; |
||||
|
-- ----------------------------------------------------------------------- |
||||
|
-- ----------------------------------------------------------------------- |
||||
|
DROP TABLE IF EXISTS `customer_staff_organization`; |
||||
|
CREATE TABLE `customer_staff_organization` ( |
||||
|
`ID` varchar(64) NOT NULL COMMENT 'ID', |
||||
|
`CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', |
||||
|
`USER_ID` varchar(64) NOT NULL COMMENT '用户ID', |
||||
|
`ORG_ID` varchar(64) NOT NULL COMMENT '组织机构ID customer_organization.id', |
||||
|
`DEL_FLAG` int(10) NOT NULL COMMENT '删除标识', |
||||
|
`REVISION` int(10) NOT NULL COMMENT '乐观锁', |
||||
|
`CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', |
||||
|
`CREATED_TIME` datetime NOT NULL COMMENT '创建时间', |
||||
|
`UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', |
||||
|
`UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', |
||||
|
PRIMARY KEY (`ID`) |
||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='组织人员关系表 '; |
||||
|
|
||||
|
-- ----------------------------------------------------------------------- |
||||
|
-- ----------------------------------------------------------------------- |
||||
|
drop table IF EXISTS customer_relevant_department; |
||||
|
drop table IF EXISTS customer_role; |
||||
|
drop table IF EXISTS customer_staff_role; |
||||
|
drop table IF EXISTS pdman_db_version; |
||||
|
|
||||
|
-- ----------------------------------------------------------------------- |
||||
|
-- ----------------------------------------------------------------------- |
||||
|
alter table customer_grid MODIFY column PID VARCHAR(64) NOT NULL COMMENT '所属组织机构ID（customer_organization.id）'; |
||||
|
alter table customer_grid MODIFY column PIDS VARCHAR(1024) NOT NULL COMMENT '所有上级组织ID'; |
||||
|
ALTER TABLE customer_grid MODIFY COLUMN CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID'; |
||||
|
ALTER TABLE customer_grid MODIFY COLUMN LONGITUDE VARCHAR(32) DEFAULT NULL COMMENT '中心位置经度'; |
||||
|
ALTER TABLE customer_grid MODIFY COLUMN LATITUDE VARCHAR(32) DEFAULT NULL COMMENT '中心位置纬度'; |
||||
|
ALTER TABLE customer_grid MODIFY COLUMN AREA_CODE VARCHAR(32) DEFAULT NULL COMMENT '所属地区码（所属组织地区码）'; |
||||
|
alter table customer_grid drop column GRID_CODE; |
||||
|
alter table customer_grid drop column SORT; |
||||
|
|
||||
|
alter table customer_grid add column ORG_ID varchar(64) NOT NULL COMMENT '所属组织机构ID（customer_organization.id）'; |
||||
|
alter table customer_grid add column MANAGE_DISTRICT varchar(255) DEFAULT "" NOT NULL COMMENT '管辖区域'; |
||||
|
alter table customer_grid add column TOTAL_USER INT(11) DEFAULT 0 NOT NULL COMMENT '当前网格总人数'; |
||||
@ -1,24 +1,24 @@ |
|||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
|
|
||||
<mapper namespace="com.epmet.dao.CustomerOrganizationDao"> |
<mapper namespace="com.epmet.dao.CustomerAgencyDao"> |
||||
|
|
||||
<resultMap type="com.epmet.entity.CustomerOrganizationEntity" id="customerOrganizationMap"> |
<resultMap type="com.epmet.entity.CustomerAgencyEntity" id="customerAgencyMap"> |
||||
<result property="id" column="id"/> |
<result property="id" column="ID"/> |
||||
<result property="customerId" column="CUSTOMER_ID"/> |
<result property="customerId" column="CUSTOMER_ID"/> |
||||
<result property="pid" column="PID"/> |
<result property="pid" column="PID"/> |
||||
<result property="pids" column="PIDS"/> |
<result property="pids" column="PIDS"/> |
||||
|
<result property="allParentName" column="ALL_PARENT_NAME"/> |
||||
<result property="organizationName" column="ORGANIZATION_NAME"/> |
<result property="organizationName" column="ORGANIZATION_NAME"/> |
||||
<result property="organizationCode" column="ORGANIZATION_CODE"/> |
|
||||
<result property="level" column="LEVEL"/> |
<result property="level" column="LEVEL"/> |
||||
<result property="areaCode" column="AREA_CODE"/> |
<result property="areaCode" column="AREA_CODE"/> |
||||
<result property="sort" column="SORT"/> |
|
||||
<result property="delFlag" column="DEL_FLAG"/> |
<result property="delFlag" column="DEL_FLAG"/> |
||||
<result property="revision" column="REVISION"/> |
<result property="revision" column="REVISION"/> |
||||
<result property="createdBy" column="CREATED_BY"/> |
<result property="createdBy" column="CREATED_BY"/> |
||||
<result property="createdTime" column="CREATED_TIME"/> |
<result property="createdTime" column="CREATED_TIME"/> |
||||
<result property="updatedBy" column="UPDATED_BY"/> |
<result property="updatedBy" column="UPDATED_BY"/> |
||||
<result property="updatedTime" column="UPDATED_TIME"/> |
<result property="updatedTime" column="UPDATED_TIME"/> |
||||
|
<result property="totalUser" column="TOTAL_USER"/> |
||||
</resultMap> |
</resultMap> |
||||
|
|
||||
|
|
||||
@ -1,19 +0,0 @@ |
|||||
<?xml version="1.0" encoding="UTF-8"?> |
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
|
||||
|
|
||||
<mapper namespace="com.epmet.dao.CustomerRelevantDepartmentDao"> |
|
||||
|
|
||||
<resultMap type="com.epmet.entity.CustomerRelevantDepartmentEntity" id="customerRelevantDepartmentMap"> |
|
||||
<result property="id" column="ID"/> |
|
||||
<result property="departmentId" column="DEPARTMENT_ID"/> |
|
||||
<result property="relevantDepartmentId" column="RELEVANT_DEPARTMENT_ID"/> |
|
||||
<result property="delFlag" column="DEL_FLAG"/> |
|
||||
<result property="revision" column="REVISION"/> |
|
||||
<result property="createdBy" column="CREATED_BY"/> |
|
||||
<result property="createdTime" column="CREATED_TIME"/> |
|
||||
<result property="updatedBy" column="UPDATED_BY"/> |
|
||||
<result property="updatedTime" column="UPDATED_TIME"/> |
|
||||
</resultMap> |
|
||||
|
|
||||
|
|
||||
</mapper> |
|
||||
@ -1,14 +1,13 @@ |
|||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
|
|
||||
<mapper namespace="com.epmet.dao.CustomerRoleDao"> |
<mapper namespace="com.epmet.dao.CustomerStaffAgencyDao"> |
||||
|
|
||||
<resultMap type="com.epmet.entity.CustomerRoleEntity" id="customerRoleMap"> |
<resultMap type="com.epmet.entity.CustomerStaffAgencyEntity" id="customerStaffAgencyMap"> |
||||
<result property="id" column="ID"/> |
<result property="id" column="ID"/> |
||||
<result property="customerId" column="CUSTOMER_ID"/> |
<result property="customerId" column="CUSTOMER_ID"/> |
||||
<result property="roleName" column="ROLE_NAME"/> |
<result property="userId" column="USER_ID"/> |
||||
<result property="roleCode" column="ROLE_CODE"/> |
<result property="agencyId" column="AGENCY_ID"/> |
||||
<result property="sort" column="SORT"/> |
|
||||
<result property="delFlag" column="DEL_FLAG"/> |
<result property="delFlag" column="DEL_FLAG"/> |
||||
<result property="revision" column="REVISION"/> |
<result property="revision" column="REVISION"/> |
||||
<result property="createdBy" column="CREATED_BY"/> |
<result property="createdBy" column="CREATED_BY"/> |
||||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue