- * 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.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-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;
-
-}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/OrgTreeNode.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/OrgTreeNode.java
new file mode 100644
index 0000000000..064d2173ea
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/OrgTreeNode.java
@@ -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 subOrgs;
+}
diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml
index 3a2f83e06b..deb18a6168 100644
--- a/epmet-module/gov-org/gov-org-server/pom.xml
+++ b/epmet-module/gov-org/gov-org-server/pom.xml
@@ -106,13 +106,13 @@
-
+
- epmet
- elink@833066
+ epmet_gov_org_user
+ EpmEt-db-UsEr0
- 127.0.0.1
+ 192.168.1.1306379123456
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRoleController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
similarity index 67%
rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRoleController.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
index 01c6e713fd..550cdb1832 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRoleController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
@@ -25,9 +25,9 @@ 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.CustomerRoleDTO;
-import com.epmet.excel.CustomerRoleExcel;
-import com.epmet.service.CustomerRoleService;
+import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.excel.CustomerAgencyExcel;
+import com.epmet.service.CustomerAgencyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -37,43 +37,43 @@ import java.util.Map;
/**
- * 客户角色表
+ * 机关单位信息表
*
* @author generator generator@elink-cn.com
- * @since v1.0.0 2020-03-16
+ * @since v1.0.0 2020-04-20
*/
@RestController
-@RequestMapping("customerrole")
-public class CustomerRoleController {
+@RequestMapping("customeragency")
+public class CustomerAgencyController {
@Autowired
- private CustomerRoleService customerRoleService;
+ private CustomerAgencyService customerAgencyService;
@GetMapping("page")
- public Result> page(@RequestParam Map params){
- PageData page = customerRoleService.page(params);
- return new Result>().ok(page);
+ public Result> page(@RequestParam Map params){
+ PageData page = customerAgencyService.page(params);
+ return new Result>().ok(page);
}
@GetMapping("{id}")
- public Result get(@PathVariable("id") String id){
- CustomerRoleDTO data = customerRoleService.get(id);
- return new Result().ok(data);
+ public Result get(@PathVariable("id") String id){
+ CustomerAgencyDTO data = customerAgencyService.get(id);
+ return new Result().ok(data);
}
@PostMapping
- public Result save(@RequestBody CustomerRoleDTO dto){
+ public Result save(@RequestBody CustomerAgencyDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
- customerRoleService.save(dto);
+ customerAgencyService.save(dto);
return new Result();
}
@PutMapping
- public Result update(@RequestBody CustomerRoleDTO dto){
+ public Result update(@RequestBody CustomerAgencyDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
- customerRoleService.update(dto);
+ customerAgencyService.update(dto);
return new Result();
}
@@ -81,14 +81,14 @@ public class CustomerRoleController {
public Result delete(@RequestBody String[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
- customerRoleService.delete(ids);
+ customerAgencyService.delete(ids);
return new Result();
}
@GetMapping("export")
public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
- List list = customerRoleService.list(params);
- ExcelUtils.exportExcelToTarget(response, null, list, CustomerRoleExcel.class);
+ List list = customerAgencyService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, CustomerAgencyExcel.class);
}
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerDepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerDepartmentController.java
index 6ca515264a..5f8dc2e298 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerDepartmentController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerDepartmentController.java
@@ -37,10 +37,10 @@ import java.util.Map;
/**
- * 客户部门表
+ * 客户部门表
*
* @author generator generator@elink-cn.com
- * @since v1.0.0 2020-03-16
+ * @since v1.0.0 2020-04-20
*/
@RestController
@RequestMapping("customerdepartment")
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerOrganizationController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerOrganizationController.java
deleted file mode 100644
index d411443b2c..0000000000
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerOrganizationController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- *
- * 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.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-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> page(@RequestParam Map params){
- PageData page = customerOrganizationService.page(params);
- return new Result>().ok(page);
- }
-
- @GetMapping("{id}")
- public Result get(@PathVariable("id") String id){
- CustomerOrganizationDTO data = customerOrganizationService.get(id);
- return new Result().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 params, HttpServletResponse response) throws Exception {
- List list = customerOrganizationService.list(params);
- ExcelUtils.exportExcelToTarget(response, null, list, CustomerOrganizationExcel.class);
- }
-
-}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRelevantDepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRelevantDepartmentController.java
deleted file mode 100644
index 7cc6d6811e..0000000000
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRelevantDepartmentController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- *
- * 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.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-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> page(@RequestParam Map params){
- PageData page = customerRelevantDepartmentService.page(params);
- return new Result>().ok(page);
- }
-
- @GetMapping("{id}")
- public Result get(@PathVariable("id") String id){
- CustomerRelevantDepartmentDTO data = customerRelevantDepartmentService.get(id);
- return new Result().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 params, HttpServletResponse response) throws Exception {
- List list = customerRelevantDepartmentService.list(params);
- ExcelUtils.exportExcelToTarget(response, null, list, CustomerRelevantDepartmentExcel.class);
- }
-
-}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffRoleController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffAgencyController.java
similarity index 64%
rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffRoleController.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffAgencyController.java
index b277f187c7..58219da027 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffRoleController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffAgencyController.java
@@ -25,9 +25,9 @@ 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.CustomerStaffRoleDTO;
-import com.epmet.excel.CustomerStaffRoleExcel;
-import com.epmet.service.CustomerStaffRoleService;
+import com.epmet.dto.CustomerStaffAgencyDTO;
+import com.epmet.excel.CustomerStaffAgencyExcel;
+import com.epmet.service.CustomerStaffAgencyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -37,43 +37,43 @@ import java.util.Map;
/**
- * 客户人员角色表
+ * 人员-机关单位关系表
*
* @author generator generator@elink-cn.com
- * @since v1.0.0 2020-03-16
+ * @since v1.0.0 2020-04-20
*/
@RestController
-@RequestMapping("customerstaffrole")
-public class CustomerStaffRoleController {
+@RequestMapping("customerstaffagency")
+public class CustomerStaffAgencyController {
@Autowired
- private CustomerStaffRoleService customerStaffRoleService;
+ private CustomerStaffAgencyService customerStaffAgencyService;
@GetMapping("page")
- public Result> page(@RequestParam Map params){
- PageData page = customerStaffRoleService.page(params);
- return new Result>().ok(page);
+ public Result> page(@RequestParam Map params){
+ PageData page = customerStaffAgencyService.page(params);
+ return new Result>().ok(page);
}
@GetMapping("{id}")
- public Result get(@PathVariable("id") String id){
- CustomerStaffRoleDTO data = customerStaffRoleService.get(id);
- return new Result().ok(data);
+ public Result get(@PathVariable("id") String id){
+ CustomerStaffAgencyDTO data = customerStaffAgencyService.get(id);
+ return new Result().ok(data);
}
@PostMapping
- public Result save(@RequestBody CustomerStaffRoleDTO dto){
+ public Result save(@RequestBody CustomerStaffAgencyDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
- customerStaffRoleService.save(dto);
+ customerStaffAgencyService.save(dto);
return new Result();
}
@PutMapping
- public Result update(@RequestBody CustomerStaffRoleDTO dto){
+ public Result update(@RequestBody CustomerStaffAgencyDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
- customerStaffRoleService.update(dto);
+ customerStaffAgencyService.update(dto);
return new Result();
}
@@ -81,14 +81,14 @@ public class CustomerStaffRoleController {
public Result delete(@RequestBody String[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
- customerStaffRoleService.delete(ids);
+ customerStaffAgencyService.delete(ids);
return new Result();
}
@GetMapping("export")
public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
- List list = customerStaffRoleService.list(params);
- ExcelUtils.exportExcelToTarget(response, null, list, CustomerStaffRoleExcel.class);
+ List list = customerStaffAgencyService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, CustomerStaffAgencyExcel.class);
}
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffDepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffDepartmentController.java
index b883f6a933..ee22c850bb 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffDepartmentController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffDepartmentController.java
@@ -37,10 +37,10 @@ import java.util.Map;
/**
- * 客户人员部门表
+ * 部门人员关系表
*
* @author generator generator@elink-cn.com
- * @since v1.0.0 2020-03-16
+ * @since v1.0.0 2020-04-20
*/
@RestController
@RequestMapping("customerstaffdepartment")
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java
index 752fb2b9fc..ec584efb56 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java
@@ -17,9 +17,7 @@
package com.epmet.controller;
-import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
@@ -29,7 +27,6 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.dto.CustomerStaffGridDTO;
import com.epmet.excel.CustomerStaffGridExcel;
-import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
import com.epmet.service.CustomerStaffGridService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -40,10 +37,10 @@ import java.util.Map;
/**
- * 客户人员网格表
+ * 网格人员关系表
*
* @author generator generator@elink-cn.com
- * @since v1.0.0 2020-03-16
+ * @since v1.0.0 2020-04-20
*/
@RestController
@RequestMapping("customerstaffgrid")
@@ -94,15 +91,4 @@ public class CustomerStaffGridController {
ExcelUtils.exportExcelToTarget(response, null, list, CustomerStaffGridExcel.class);
}
- /**
- * @param
- * @Author sun
- * @Description 政府端-热心居民申请人工审核
- **/
- @PostMapping("manageaudit")
- public Result manageAudit(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedAuditFormDTO formDTO) {
- ValidatorUtils.validateEntity(formDTO);
- return customerStaffGridService.manageAudit(tokenDTO, formDTO);
- }
-
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffRoleDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
similarity index 83%
rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffRoleDao.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
index 21c279d181..185d2d33a1 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffRoleDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
@@ -18,16 +18,16 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.CustomerStaffRoleEntity;
+import com.epmet.entity.CustomerAgencyEntity;
import org.apache.ibatis.annotations.Mapper;
/**
- * 客户人员角色表
+ * 机关单位信息表
*
* @author generator generator@elink-cn.com
- * @since v1.0.0 2020-03-16
+ * @since v1.0.0 2020-04-20
*/
@Mapper
-public interface CustomerStaffRoleDao extends BaseDao {
+public interface CustomerAgencyDao extends BaseDao {
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java
index 88235a5429..bd188f8351 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java
@@ -22,10 +22,10 @@ import com.epmet.entity.CustomerDepartmentEntity;
import org.apache.ibatis.annotations.Mapper;
/**
- * 客户部门表
+ * 客户部门表
*
* @author generator generator@elink-cn.com
- * @since v1.0.0 2020-03-16
+ * @since v1.0.0 2020-04-20
*/
@Mapper
public interface CustomerDepartmentDao extends BaseDao {
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRelevantDepartmentDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRelevantDepartmentDao.java
deleted file mode 100644
index a054e54fdc..0000000000
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRelevantDepartmentDao.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- *
- * 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.
- *
- * 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.
- *
- * 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.
- *
- * 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.
- *
- * 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.
- *
- * 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.
- *
- * 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.
- *
- * 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.
- *
- * 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.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-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;
- }
-
-}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffRoleRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffAgencyRedis.java
similarity index 92%
rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffRoleRedis.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffAgencyRedis.java
index 880014e64b..fa3f4c59f5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffRoleRedis.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffAgencyRedis.java
@@ -22,13 +22,13 @@ 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
+ * @since v1.0.0 2020-04-20
*/
@Component
-public class CustomerStaffRoleRedis {
+public class CustomerStaffAgencyRedis {
@Autowired
private RedisUtils redisUtils;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffDepartmentRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffDepartmentRedis.java
index b2d6ed382a..3c8bfdb608 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffDepartmentRedis.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffDepartmentRedis.java
@@ -22,10 +22,10 @@ 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
+ * @since v1.0.0 2020-04-20
*/
@Component
public class CustomerStaffDepartmentRedis {
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffGridRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffGridRedis.java
index 4d0a0b4732..23b0eab20a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffGridRedis.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffGridRedis.java
@@ -22,10 +22,10 @@ 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
+ * @since v1.0.0 2020-04-20
*/
@Component
public class CustomerStaffGridRedis {
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffOrganizationRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffOrganizationRedis.java
deleted file mode 100644
index c953577757..0000000000
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffOrganizationRedis.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- *
- * 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.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-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;
- }
-
-}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRoleService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
similarity index 68%
rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRoleService.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
index d5a7c70464..319e26890f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRoleService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
@@ -19,49 +19,49 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.CustomerRoleDTO;
-import com.epmet.entity.CustomerRoleEntity;
+import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.entity.CustomerAgencyEntity;
import java.util.List;
import java.util.Map;
/**
- * 客户角色表
+ * 机关单位信息表
*
* @author generator generator@elink-cn.com
- * @since v1.0.0 2020-03-16
+ * @since v1.0.0 2020-04-20
*/
-public interface CustomerRoleService extends BaseService {
+public interface CustomerAgencyService extends BaseService {
/**
* 默认分页
*
* @param params
- * @return PageData
+ * @return PageData
* @author generator
- * @date 2020-03-16
+ * @date 2020-04-20
*/
- PageData page(Map params);
+ PageData page(Map params);
/**
* 默认查询
*
* @param params
- * @return java.util.List
+ * @return java.util.List
* @author generator
- * @date 2020-03-16
+ * @date 2020-04-20
*/
- List list(Map params);
+ List list(Map params);
/**
* 单条查询
*
* @param id
- * @return CustomerRoleDTO
+ * @return CustomerAgencyDTO
* @author generator
- * @date 2020-03-16
+ * @date 2020-04-20
*/
- CustomerRoleDTO get(String id);
+ CustomerAgencyDTO get(String id);
/**
* 默认保存
@@ -69,9 +69,9 @@ public interface CustomerRoleService extends BaseService {
* @param dto
* @return void
* @author generator
- * @date 2020-03-16
+ * @date 2020-04-20
*/
- void save(CustomerRoleDTO dto);
+ void save(CustomerAgencyDTO dto);
/**
* 默认更新
@@ -79,9 +79,9 @@ public interface CustomerRoleService extends BaseService {
* @param dto
* @return void
* @author generator
- * @date 2020-03-16
+ * @date 2020-04-20
*/
- void update(CustomerRoleDTO dto);
+ void update(CustomerAgencyDTO dto);
/**
* 批量删除
@@ -89,7 +89,7 @@ public interface CustomerRoleService extends BaseService {
* @param ids
* @return void
* @author generator
- * @date 2020-03-16
+ * @date 2020-04-20
*/
void delete(String[] ids);
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java
index 46a5016af2..9722ca82af 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java
@@ -26,10 +26,10 @@ import java.util.List;
import java.util.Map;
/**
- * 客户部门表
+ * 客户部门表
*
* @author generator generator@elink-cn.com
- * @since v1.0.0 2020-03-16
+ * @since v1.0.0 2020-04-20
*/
public interface CustomerDepartmentService extends BaseService {
@@ -39,7 +39,7 @@ public interface CustomerDepartmentService extends BaseService
* @author generator
- * @date 2020-03-16
+ * @date 2020-04-20
*/
PageData page(Map params);
@@ -49,7 +49,7 @@ public interface CustomerDepartmentService extends BaseService
* @author generator
- * @date 2020-03-16
+ * @date 2020-04-20
*/
List list(Map params);
@@ -59,7 +59,7 @@ public interface CustomerDepartmentService extends BaseService {
+public interface CustomerStaffAgencyService extends BaseService {
/**
* 默认分页
*
* @param params
- * @return PageData
+ * @return PageData
* @author generator
- * @date 2020-03-16
+ * @date 2020-04-20
*/
- PageData page(Map params);
+ PageData page(Map params);
/**
* 默认查询
*
* @param params
- * @return java.util.List
+ * @return java.util.List
* @author generator
- * @date 2020-03-16
+ * @date 2020-04-20
*/
- List list(Map params);
+ List list(Map params);
/**
* 单条查询
*
* @param id
- * @return CustomerOrganizationDTO
+ * @return CustomerStaffAgencyDTO
* @author generator
- * @date 2020-03-16
+ * @date 2020-04-20
*/
- CustomerOrganizationDTO get(String id);
+ CustomerStaffAgencyDTO get(String id);
/**
* 默认保存
@@ -69,9 +69,9 @@ public interface CustomerOrganizationService extends BaseService {
@@ -39,7 +39,7 @@ public interface CustomerStaffDepartmentService extends BaseService
* @author generator
- * @date 2020-03-16
+ * @date 2020-04-20
*/
PageData page(Map params);
@@ -49,7 +49,7 @@ public interface CustomerStaffDepartmentService extends BaseService
* @author generator
- * @date 2020-03-16
+ * @date 2020-04-20
*/
List list(Map params);
@@ -59,7 +59,7 @@ public interface CustomerStaffDepartmentService extends BaseService {
@@ -42,7 +39,7 @@ public interface CustomerStaffGridService extends BaseService
* @author generator
- * @date 2020-03-16
+ * @date 2020-04-20
*/
PageData page(Map params);
@@ -52,7 +49,7 @@ public interface CustomerStaffGridService extends BaseService
* @author generator
- * @date 2020-03-16
+ * @date 2020-04-20
*/
List list(Map params);
@@ -62,7 +59,7 @@ public interface CustomerStaffGridService extends BaseService
- * 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.
- *
- * 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.
- *
- * 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.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-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 implements CustomerOrganizationService {
-
- @Autowired
- private CustomerOrganizationRedis customerOrganizationRedis;
-
- @Override
- public PageData page(Map params) {
- IPage page = baseDao.selectPage(
- getPage(params, FieldConstant.CREATED_TIME, false),
- getWrapper(params)
- );
- return getPageData(page, CustomerOrganizationDTO.class);
- }
-
- @Override
- public List list(Map params) {
- List entityList = baseDao.selectList(getWrapper(params));
-
- return ConvertUtils.sourceToTarget(entityList, CustomerOrganizationDTO.class);
- }
-
- private QueryWrapper getWrapper(Map params){
- String id = (String)params.get(FieldConstant.ID_HUMP);
-
- QueryWrapper 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));
- }
-
-}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRelevantDepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRelevantDepartmentServiceImpl.java
deleted file mode 100644
index 090d95b5cc..0000000000
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRelevantDepartmentServiceImpl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- *
- * 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.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-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 implements CustomerRelevantDepartmentService {
-
- @Autowired
- private CustomerRelevantDepartmentRedis customerRelevantDepartmentRedis;
-
- @Override
- public PageData page(Map params) {
- IPage page = baseDao.selectPage(
- getPage(params, FieldConstant.CREATED_TIME, false),
- getWrapper(params)
- );
- return getPageData(page, CustomerRelevantDepartmentDTO.class);
- }
-
- @Override
- public List list(Map params) {
- List entityList = baseDao.selectList(getWrapper(params));
-
- return ConvertUtils.sourceToTarget(entityList, CustomerRelevantDepartmentDTO.class);
- }
-
- private QueryWrapper getWrapper(Map params){
- String id = (String)params.get(FieldConstant.ID_HUMP);
-
- QueryWrapper 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));
- }
-
-}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffRoleServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffAgencyServiceImpl.java
similarity index 60%
rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffRoleServiceImpl.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffAgencyServiceImpl.java
index 52835fe03c..f1786860da 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffRoleServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffAgencyServiceImpl.java
@@ -23,11 +23,11 @@ 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.CustomerStaffRoleDao;
-import com.epmet.dto.CustomerStaffRoleDTO;
-import com.epmet.entity.CustomerStaffRoleEntity;
-import com.epmet.redis.CustomerStaffRoleRedis;
-import com.epmet.service.CustomerStaffRoleService;
+import com.epmet.dao.CustomerStaffAgencyDao;
+import com.epmet.dto.CustomerStaffAgencyDTO;
+import com.epmet.entity.CustomerStaffAgencyEntity;
+import com.epmet.redis.CustomerStaffAgencyRedis;
+import com.epmet.service.CustomerStaffAgencyService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -38,59 +38,59 @@ import java.util.List;
import java.util.Map;
/**
- * 客户人员角色表
+ * 人员-机关单位关系表
*
* @author generator generator@elink-cn.com
- * @since v1.0.0 2020-03-16
+ * @since v1.0.0 2020-04-20
*/
@Service
-public class CustomerStaffRoleServiceImpl extends BaseServiceImpl implements CustomerStaffRoleService {
+public class CustomerStaffAgencyServiceImpl extends BaseServiceImpl implements CustomerStaffAgencyService {
@Autowired
- private CustomerStaffRoleRedis customerStaffRoleRedis;
+ private CustomerStaffAgencyRedis customerStaffAgencyRedis;
@Override
- public PageData page(Map params) {
- IPage page = baseDao.selectPage(
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
- return getPageData(page, CustomerStaffRoleDTO.class);
+ return getPageData(page, CustomerStaffAgencyDTO.class);
}
@Override
- public List list(Map params) {
- List entityList = baseDao.selectList(getWrapper(params));
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
- return ConvertUtils.sourceToTarget(entityList, CustomerStaffRoleDTO.class);
+ return ConvertUtils.sourceToTarget(entityList, CustomerStaffAgencyDTO.class);
}
- private QueryWrapper getWrapper(Map params){
+ private QueryWrapper getWrapper(Map params){
String id = (String)params.get(FieldConstant.ID_HUMP);
- QueryWrapper wrapper = new QueryWrapper<>();
+ QueryWrapper wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper;
}
@Override
- public CustomerStaffRoleDTO get(String id) {
- CustomerStaffRoleEntity entity = baseDao.selectById(id);
- return ConvertUtils.sourceToTarget(entity, CustomerStaffRoleDTO.class);
+ public CustomerStaffAgencyDTO get(String id) {
+ CustomerStaffAgencyEntity entity = baseDao.selectById(id);
+ return ConvertUtils.sourceToTarget(entity, CustomerStaffAgencyDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
- public void save(CustomerStaffRoleDTO dto) {
- CustomerStaffRoleEntity entity = ConvertUtils.sourceToTarget(dto, CustomerStaffRoleEntity.class);
+ public void save(CustomerStaffAgencyDTO dto) {
+ CustomerStaffAgencyEntity entity = ConvertUtils.sourceToTarget(dto, CustomerStaffAgencyEntity.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
- public void update(CustomerStaffRoleDTO dto) {
- CustomerStaffRoleEntity entity = ConvertUtils.sourceToTarget(dto, CustomerStaffRoleEntity.class);
+ public void update(CustomerStaffAgencyDTO dto) {
+ CustomerStaffAgencyEntity entity = ConvertUtils.sourceToTarget(dto, CustomerStaffAgencyEntity.class);
updateById(entity);
}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffDepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffDepartmentServiceImpl.java
index 1273b9fa90..81cf6dafd9 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffDepartmentServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffDepartmentServiceImpl.java
@@ -38,10 +38,10 @@ import java.util.List;
import java.util.Map;
/**
- * 客户人员部门表
+ * 部门人员关系表
*
* @author generator generator@elink-cn.com
- * @since v1.0.0 2020-03-16
+ * @since v1.0.0 2020-04-20
*/
@Service
public class CustomerStaffDepartmentServiceImpl extends BaseServiceImpl implements CustomerStaffDepartmentService {
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java
index 1e31399e1d..894bb6a888 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java
@@ -20,25 +20,15 @@ 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.constant.FieldConstant;
-import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.exception.EpmetErrorCode;
-import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.dao.CustomerStaffGridDao;
import com.epmet.dto.CustomerStaffGridDTO;
import com.epmet.entity.CustomerStaffGridEntity;
-import com.epmet.feign.ResiPartymemberFeignClient;
import com.epmet.redis.CustomerStaffGridRedis;
-import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
import com.epmet.service.CustomerStaffGridService;
-import com.epmet.util.ModuleConstant;
import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -48,18 +38,16 @@ import java.util.List;
import java.util.Map;
/**
- * 客户人员网格表
+ * 网格人员关系表
*
* @author generator generator@elink-cn.com
- * @since v1.0.0 2020-03-16
+ * @since v1.0.0 2020-04-20
*/
@Service
public class CustomerStaffGridServiceImpl extends BaseServiceImpl implements CustomerStaffGridService {
- private static final Logger logger = LoggerFactory.getLogger(CustomerStaffGridServiceImpl.class);
+
@Autowired
private CustomerStaffGridRedis customerStaffGridRedis;
- @Autowired
- private ResiPartymemberFeignClient resiPartymemberFeignClient;
@Override
public PageData page(Map params) {
@@ -77,8 +65,8 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl getWrapper(Map params) {
- String id = (String) params.get(FieldConstant.ID_HUMP);
+ private QueryWrapper getWrapper(Map params){
+ String id = (String)params.get(FieldConstant.ID_HUMP);
QueryWrapper wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -113,20 +101,4 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl
- * 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.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-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 implements CustomerStaffOrganizationService {
-
- @Autowired
- private CustomerStaffOrganizationRedis customerStaffOrganizationRedis;
-
- @Override
- public PageData page(Map params) {
- IPage page = baseDao.selectPage(
- getPage(params, FieldConstant.CREATED_TIME, false),
- getWrapper(params)
- );
- return getPageData(page, CustomerStaffOrganizationDTO.class);
- }
-
- @Override
- public List list(Map params) {
- List entityList = baseDao.selectList(getWrapper(params));
-
- return ConvertUtils.sourceToTarget(entityList, CustomerStaffOrganizationDTO.class);
- }
-
- private QueryWrapper getWrapper(Map params){
- String id = (String)params.get(FieldConstant.ID_HUMP);
-
- QueryWrapper 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));
- }
-
-}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/epmet_gov_org.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/epmet_gov_org.sql
new file mode 100644
index 0000000000..c53d7724f0
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/epmet_gov_org.sql
@@ -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 '当前网格总人数';
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerOrganizationDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
similarity index 72%
rename from epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerOrganizationDao.xml
rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index a426a91bb1..18bb63b7b9 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerOrganizationDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -1,24 +1,24 @@
-
+
-
-
+
+
+
-
-
+
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml
index 66f55caad8..9f595da2fe 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml
@@ -7,10 +7,9 @@
-
-
-
-
+
+
+
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 80f430442c..7c35a3e1c5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -2,37 +2,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-