From c80183c7cdd7b78ae5cf9486653361faf6a3662c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 21 Apr 2020 16:10:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=981?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/feign/EpmetUserFeignClient.java | 4 +- .../service/impl/GovLoginServiceImpl.java | 4 +- .../src/main/resources/application.yml | 6 +- .../com/epmet/dto/CustomerDepartmentDTO.java | 7 +- .../entity/CustomerDepartmentEntity.java | 5 +- .../resources/db/migration/epmet_gov_org.sql | 34 +++---- ...oryDTO.java => StaffAgencyVisitedDTO.java} | 13 ++- .../com/epmet/dto/StaffGridVisitedDTO.java | 86 ++++++++++++++++ ...java => StaffAgencyVisitedController.java} | 17 ++-- .../StaffGridVisitedController.java | 39 ++++++++ ...oryDao.java => StaffAgencyVisitedDao.java} | 8 +- .../com/epmet/dao/StaffGridVisitedDao.java | 33 +++++++ ...ity.java => StaffAgencyVisitedEntity.java} | 12 +-- .../epmet/entity/StaffGridVisitedEntity.java | 56 +++++++++++ ...ce.java => StaffAgencyVisitedService.java} | 39 ++++---- .../service/StaffGridVisitedService.java | 95 ++++++++++++++++++ .../service/UserResiRegisterVisitService.java | 2 - ...ava => StaffAgencyVisitedServiceImpl.java} | 48 ++++----- .../impl/StaffGridVisitedServiceImpl.java | 99 +++++++++++++++++++ .../resources/db/migration/epmet_user.sql | 20 +++- ...storyDao.xml => StaffAgencyVisitedDao.xml} | 6 +- .../resources/mapper/StaffGridVisitedDao.xml | 20 ++++ 22 files changed, 544 insertions(+), 109 deletions(-) rename epmet-user/epmet-user-client/src/main/java/com/epmet/dto/{StaffAgencyHistoryDTO.java => StaffAgencyVisitedDTO.java} (89%) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffGridVisitedDTO.java rename epmet-user/epmet-user-server/src/main/java/com/epmet/controller/{StaffAgencyHistoryController.java => StaffAgencyVisitedController.java} (82%) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffGridVisitedController.java rename epmet-user/epmet-user-server/src/main/java/com/epmet/dao/{StaffAgencyHistoryDao.java => StaffAgencyVisitedDao.java} (86%) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffGridVisitedDao.java rename epmet-user/epmet-user-server/src/main/java/com/epmet/entity/{StaffAgencyHistoryEntity.java => StaffAgencyVisitedEntity.java} (85%) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffGridVisitedEntity.java rename epmet-user/epmet-user-server/src/main/java/com/epmet/service/{StaffAgencyHistoryService.java => StaffAgencyVisitedService.java} (74%) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffGridVisitedService.java rename epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/{StaffAgencyHistoryServiceImpl.java => StaffAgencyVisitedServiceImpl.java} (67%) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffGridVisitedServiceImpl.java rename epmet-user/epmet-user-server/src/main/resources/mapper/{StaffAgencyHistoryDao.xml => StaffAgencyVisitedDao.xml} (86%) create mode 100644 epmet-user/epmet-user-server/src/main/resources/mapper/StaffGridVisitedDao.xml diff --git a/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java index d0a61aa757..6bebb97f96 100644 --- a/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java +++ b/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java @@ -85,7 +85,7 @@ public interface EpmetUserFeignClient { * @Description 获取当前微信上次登录的账号信息 * @Date 2020/4/20 12:53 **/ - @GetMapping(value = "epmetuser/staffagencyhistory/getlatest/{openId}") + @GetMapping(value = "epmetuser/staffagencyvisited/getlatest/{openId}") Result getLatestStaffWechatLoginRecord(@PathVariable("openId") String openId); /** @@ -105,6 +105,6 @@ public interface EpmetUserFeignClient { * @Description 保存登录日志 * @Date 2020/4/20 14:38 **/ - @PostMapping(value = "epmetuser/staffagencyhistory/saveStaffLoginRecord", consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(value = "epmetuser/staffagencyvisited/saveStaffLoginRecord", consumes = MediaType.APPLICATION_JSON_VALUE) Result saveStaffLoginRecord(StaffLoginAgencyRecordFormDTO staffLoginHistoryFormDTO); } diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java index 6ceb130e79..85c6991c39 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java @@ -149,7 +149,7 @@ public class GovLoginServiceImpl implements GovLoginService { GovTokenDto govTokenDto = new GovTokenDto(); govTokenDto.setApp(LoginConstant.APP_GOV); govTokenDto.setClient(LoginConstant.CLIENT_WXMP); - govTokenDto.setStaffId(staffLatestAgency.getStaffId()); + govTokenDto.setUserId(staffLatestAgency.getStaffId()); govTokenDto.setOpenId(wxMaJscode2SessionResult.getOpenid()); govTokenDto.setSessionKey(wxMaJscode2SessionResult.getSessionKey()); govTokenDto.setUnionId(wxMaJscode2SessionResult.getUnionid()); @@ -256,7 +256,7 @@ public class GovLoginServiceImpl implements GovLoginService { GovTokenDto govTokenDto = new GovTokenDto(); govTokenDto.setApp(LoginConstant.APP_GOV); govTokenDto.setClient(LoginConstant.CLIENT_WXMP); - govTokenDto.setStaffId(staffId); + govTokenDto.setUserId(staffId); govTokenDto.setOpenId(wxMaJscode2SessionResult.getOpenid()); govTokenDto.setSessionKey(wxMaJscode2SessionResult.getSessionKey()); govTokenDto.setUnionId(wxMaJscode2SessionResult.getUnionid()); diff --git a/epmet-cloud-generator/src/main/resources/application.yml b/epmet-cloud-generator/src/main/resources/application.yml index ec95859518..f759f036b9 100644 --- a/epmet-cloud-generator/src/main/resources/application.yml +++ b/epmet-cloud-generator/src/main/resources/application.yml @@ -9,9 +9,9 @@ spring: type: com.alibaba.druid.pool.DruidDataSource #MySQL配置 driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://localhost:3306/epmet_user?useUnicode=true&characterEncoding=UTF-8&useSSL=false - username: epmet - password: elink@833066 + url: jdbc:mysql://192.168.1.130:3306/epmet_user?useUnicode=true&characterEncoding=UTF-8&useSSL=false + username: epmet_dba + password: EpmEt-dbA-UsEr #oracle配置 # driverClassName: oracle.jdbc.OracleDriver # url: jdbc:oracle:thin:@192.168.10.10:1521:helowin diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java index 0248ff77e2..3c97da56b3 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java @@ -17,9 +17,10 @@ package com.epmet.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** @@ -44,9 +45,9 @@ public class CustomerDepartmentDTO implements Serializable { private String customerId; /** - * 所属组织机构ID（customer_organization.id） + * 所属组织机构ID（customer_organization.id）AGENCY_ID */ - private String orgId; + private String agencyId; /** * 部门名称 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java index b34f814bc1..4c0ccf2156 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java @@ -18,13 +18,10 @@ 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; - /** * 客户部门表 * @@ -46,7 +43,7 @@ public class CustomerDepartmentEntity extends BaseEpmetEntity { /** * 所属组织机构ID（customer_organization.id） */ - private String orgId; + private String agencyId; /** * 部门名称 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 index c53d7724f0..34bf6d70cc 100644 --- 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 @@ -2,7 +2,7 @@ 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）', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '所属机关ID（customer_agency.id）', `DEPARTMENT_NAME` varchar(128) NOT NULL COMMENT '部门名称', `DEPARTMENT_DUTY` varchar(255) NOT NULL COMMENT '部门职责', `TOTAL_USER` int(11) NOT NULL COMMENT '总人数', @@ -12,19 +12,19 @@ CREATE TABLE `customer_department` ( `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='客户部门表 '; + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='客户部门表 '; -- ----------------------------------------------------------------------- -- ----------------------------------------------------------------------- -DROP TABLE IF EXISTS `customer_organization`; -CREATE TABLE `customer_organization` ( +DROP TABLE IF EXISTS `customer_agency`; +CREATE TABLE `customer_agency` ( `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）', + `LEVEL` varchar(30) 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 '乐观锁', @@ -33,8 +33,8 @@ CREATE TABLE `customer_organization` ( `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='组织机构表 '; + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='机关单位信息表'; -- ----------------------------------------------------------------------- -- ----------------------------------------------------------------------- DROP TABLE IF EXISTS `customer_staff_department`; @@ -49,8 +49,8 @@ CREATE TABLE `customer_staff_department` ( `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='部门人员关系表 '; + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='部门人员关系表 '; -- ----------------------------------------------------------------------- -- ----------------------------------------------------------------------- @@ -66,24 +66,24 @@ CREATE TABLE `customer_staff_grid` ( `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='网格人员关系表 '; + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='网格人员关系表 '; -- ----------------------------------------------------------------------- -- ----------------------------------------------------------------------- -DROP TABLE IF EXISTS `customer_staff_organization`; -CREATE TABLE `customer_staff_organization` ( +DROP TABLE IF EXISTS `customer_staff_agency`; +CREATE TABLE `customer_staff_agency` ( `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', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '组织机构ID customer_agency.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='组织人员关系表 '; + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='人员-机关单位关系表'; -- ----------------------------------------------------------------------- -- ----------------------------------------------------------------------- diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffAgencyHistoryDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffAgencyVisitedDTO.java similarity index 89% rename from epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffAgencyHistoryDTO.java rename to epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffAgencyVisitedDTO.java index 21b6eb47b6..45c5c443a8 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffAgencyHistoryDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffAgencyVisitedDTO.java @@ -17,20 +17,19 @@ package com.epmet.dto; -import lombok.Data; - import java.io.Serializable; import java.util.Date; +import lombok.Data; /** - * 工作人员登录组织日志表 + * 工作人员进入组织日志表 * * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-20 + * @since v1.0.0 2020-04-21 */ @Data -public class StaffAgencyHistoryDTO implements Serializable { +public class StaffAgencyVisitedDTO implements Serializable { private static final long serialVersionUID = 1L; @@ -60,9 +59,9 @@ public class StaffAgencyHistoryDTO implements Serializable { private String mobile; /** - * 组织机构id + * 机关单位id来源于customer_agency.id */ - private String orgId; + private String agencyId; /** * 删除标识：0.未删除 1.已删除 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffGridVisitedDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffGridVisitedDTO.java new file mode 100644 index 0000000000..328aafad2e --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffGridVisitedDTO.java @@ -0,0 +1,86 @@ +/** + * 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.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 工作人员进入网格日志表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-21 + */ +@Data +public class StaffGridVisitedDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 唯一标识 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 网格ID + */ + private String gridId; + + /** + * customer_staff.userId + */ + private String staffId; + + /** + * 删除标识：0.未删除 1.已删除 + */ + 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-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyHistoryController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyVisitedController.java similarity index 82% rename from epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyHistoryController.java rename to epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyVisitedController.java index aa1a81426f..5111dc2a25 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyHistoryController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyVisitedController.java @@ -20,24 +20,23 @@ package com.epmet.controller; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.StaffLoginAgencyRecordFormDTO; import com.epmet.dto.result.StaffLatestAgencyResultDTO; -import com.epmet.service.StaffAgencyHistoryService; +import com.epmet.service.StaffAgencyVisitedService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; /** - * 工作人员登录组织日志表 + * 工作人员进入组织日志表 * * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-20 + * @since v1.0.0 2020-04-21 */ @RestController -@RequestMapping("staffagencyhistory") -public class StaffAgencyHistoryController { +@RequestMapping("staffagencyvisited") +public class StaffAgencyVisitedController { @Autowired - private StaffAgencyHistoryService staffAgencyHistoryService; - + private StaffAgencyVisitedService staffAgencyVisitedService; /** * @param openId @@ -48,7 +47,7 @@ public class StaffAgencyHistoryController { **/ @GetMapping(value = "getlatest/{openId}") public Result getLatestStaffWechatLoginRecord(@PathVariable("openId") String openId) { - return staffAgencyHistoryService.getLatestStaffWechatLoginRecord(openId); + return staffAgencyVisitedService.getLatestStaffWechatLoginRecord(openId); } /** @@ -60,6 +59,6 @@ public class StaffAgencyHistoryController { **/ @PostMapping(value = "saveStaffLoginRecord") public Result saveStaffLoginRecord(@RequestBody StaffLoginAgencyRecordFormDTO formDTO) { - return staffAgencyHistoryService.saveStaffLoginRecord(formDTO); + return staffAgencyVisitedService.saveStaffLoginRecord(formDTO); } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffGridVisitedController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffGridVisitedController.java new file mode 100644 index 0000000000..ec34fb21fb --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffGridVisitedController.java @@ -0,0 +1,39 @@ +/** + * 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.service.StaffGridVisitedService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * 工作人员进入网格日志表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-21 + */ +@RestController +@RequestMapping("staffgridvisited") +public class StaffGridVisitedController { + + @Autowired + private StaffGridVisitedService staffGridVisitedService; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffAgencyHistoryDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffAgencyVisitedDao.java similarity index 86% rename from epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffAgencyHistoryDao.java rename to epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffAgencyVisitedDao.java index 0e6739ad58..189b179f0c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffAgencyHistoryDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffAgencyVisitedDao.java @@ -19,17 +19,17 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.result.StaffLatestAgencyResultDTO; -import com.epmet.entity.StaffAgencyHistoryEntity; +import com.epmet.entity.StaffAgencyVisitedEntity; import org.apache.ibatis.annotations.Mapper; /** - * 工作人员登录组织日志表 + * 工作人员进入组织日志表 * * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-20 + * @since v1.0.0 2020-04-21 */ @Mapper -public interface StaffAgencyHistoryDao extends BaseDao { +public interface StaffAgencyVisitedDao extends BaseDao { /** * @param openId * @return com.epmet.dto.result.LatestStaffWechatLoginDTO diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffGridVisitedDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffGridVisitedDao.java new file mode 100644 index 0000000000..d905202603 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffGridVisitedDao.java @@ -0,0 +1,33 @@ +/** + * 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.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.StaffGridVisitedEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 工作人员进入网格日志表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-21 + */ +@Mapper +public interface StaffGridVisitedDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffAgencyHistoryEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffAgencyVisitedEntity.java similarity index 85% rename from epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffAgencyHistoryEntity.java rename to epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffAgencyVisitedEntity.java index 618bcba59f..44c0ab2f51 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffAgencyHistoryEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffAgencyVisitedEntity.java @@ -26,15 +26,15 @@ import lombok.EqualsAndHashCode; import java.util.Date; /** - * 工作人员登录组织日志表 + * 工作人员进入组织日志表 * * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-20 + * @since v1.0.0 2020-04-21 */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("staff_agency_history") -public class StaffAgencyHistoryEntity extends BaseEpmetEntity { +@TableName("staff_agency_visited") +public class StaffAgencyVisitedEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; @@ -59,8 +59,8 @@ public class StaffAgencyHistoryEntity extends BaseEpmetEntity { private String mobile; /** - * 组织机构id + * 机关单位id来源于customer_agency.id */ - private String orgId; + private String agencyId; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffGridVisitedEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffGridVisitedEntity.java new file mode 100644 index 0000000000..9c6ffe281e --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffGridVisitedEntity.java @@ -0,0 +1,56 @@ +/** + * 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.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-04-21 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("staff_grid_visited") +public class StaffGridVisitedEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 网格ID + */ + private String gridId; + + /** + * customer_staff.userId + */ + private String staffId; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffAgencyHistoryService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffAgencyVisitedService.java similarity index 74% rename from epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffAgencyHistoryService.java rename to epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffAgencyVisitedService.java index 413c555f7d..4b67657992 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffAgencyHistoryService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffAgencyVisitedService.java @@ -20,51 +20,51 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.StaffAgencyHistoryDTO; +import com.epmet.dto.StaffAgencyVisitedDTO; import com.epmet.dto.form.StaffLoginAgencyRecordFormDTO; import com.epmet.dto.result.StaffLatestAgencyResultDTO; -import com.epmet.entity.StaffAgencyHistoryEntity; +import com.epmet.entity.StaffAgencyVisitedEntity; import java.util.List; import java.util.Map; /** - * 工作人员登录组织日志表 + * 工作人员进入组织日志表 * * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-20 + * @since v1.0.0 2020-04-21 */ -public interface StaffAgencyHistoryService extends BaseService { +public interface StaffAgencyVisitedService extends BaseService { /** * 默认分页 * * @param params - * @return PageData + * @return PageData * @author generator - * @date 2020-04-20 + * @date 2020-04-21 */ - PageData page(Map params); + PageData page(Map params); /** * 默认查询 * * @param params - * @return java.util.List + * @return java.util.List * @author generator - * @date 2020-04-20 + * @date 2020-04-21 */ - List list(Map params); + List list(Map params); /** * 单条查询 * * @param id - * @return StaffAgencyHistoryDTO + * @return StaffAgencyVisitedDTO * @author generator - * @date 2020-04-20 + * @date 2020-04-21 */ - StaffAgencyHistoryDTO get(String id); + StaffAgencyVisitedDTO get(String id); /** * 默认保存 @@ -72,9 +72,9 @@ public interface StaffAgencyHistoryService extends BaseService diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffGridVisitedService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffGridVisitedService.java new file mode 100644 index 0000000000..ce181b1323 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffGridVisitedService.java @@ -0,0 +1,95 @@ +/** + * 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; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.StaffGridVisitedDTO; +import com.epmet.entity.StaffGridVisitedEntity; + +import java.util.List; +import java.util.Map; + +/** + * 工作人员进入网格日志表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-21 + */ +public interface StaffGridVisitedService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-04-21 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-04-21 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return StaffGridVisitedDTO + * @author generator + * @date 2020-04-21 + */ + StaffGridVisitedDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-04-21 + */ + void save(StaffGridVisitedDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-04-21 + */ + void update(StaffGridVisitedDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-04-21 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java index 579cb1e1c3..414706ee2c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java @@ -19,12 +19,10 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.UserResiRegisterVisitDTO; import com.epmet.dto.form.ResiRegisterFormDTO; -import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.VerificationCodeFormDTO; import com.epmet.dto.result.ResiRegisterResultDTO; import com.epmet.entity.UserResiRegisterVisitEntity; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffAgencyHistoryServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffAgencyVisitedServiceImpl.java similarity index 67% rename from epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffAgencyHistoryServiceImpl.java rename to epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffAgencyVisitedServiceImpl.java index 90d2e6160d..399b4c6bf0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffAgencyHistoryServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffAgencyVisitedServiceImpl.java @@ -24,12 +24,12 @@ import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dao.StaffAgencyHistoryDao; -import com.epmet.dto.StaffAgencyHistoryDTO; +import com.epmet.dao.StaffAgencyVisitedDao; +import com.epmet.dto.StaffAgencyVisitedDTO; import com.epmet.dto.form.StaffLoginAgencyRecordFormDTO; import com.epmet.dto.result.StaffLatestAgencyResultDTO; -import com.epmet.entity.StaffAgencyHistoryEntity; -import com.epmet.service.StaffAgencyHistoryService; +import com.epmet.entity.StaffAgencyVisitedEntity; +import com.epmet.service.StaffAgencyVisitedService; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,57 +41,57 @@ import java.util.List; import java.util.Map; /** - * 工作人员登录组织日志表 + * 工作人员进入组织日志表 * * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-20 + * @since v1.0.0 2020-04-21 */ @Service -public class StaffAgencyHistoryServiceImpl extends BaseServiceImpl implements StaffAgencyHistoryService { - private static final Logger logger = LoggerFactory.getLogger(StaffAgencyHistoryServiceImpl.class); +public class StaffAgencyVisitedServiceImpl extends BaseServiceImpl implements StaffAgencyVisitedService { + private static final Logger logger = LoggerFactory.getLogger(StaffAgencyVisitedServiceImpl.class); @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, StaffAgencyHistoryDTO.class); + return getPageData(page, StaffAgencyVisitedDTO.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, StaffAgencyHistoryDTO.class); + return ConvertUtils.sourceToTarget(entityList, StaffAgencyVisitedDTO.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 StaffAgencyHistoryDTO get(String id) { - StaffAgencyHistoryEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, StaffAgencyHistoryDTO.class); + public StaffAgencyVisitedDTO get(String id) { + StaffAgencyVisitedEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, StaffAgencyVisitedDTO.class); } @Override @Transactional(rollbackFor = Exception.class) - public void save(StaffAgencyHistoryDTO dto) { - StaffAgencyHistoryEntity entity = ConvertUtils.sourceToTarget(dto, StaffAgencyHistoryEntity.class); + public void save(StaffAgencyVisitedDTO dto) { + StaffAgencyVisitedEntity entity = ConvertUtils.sourceToTarget(dto, StaffAgencyVisitedEntity.class); insert(entity); } @Override @Transactional(rollbackFor = Exception.class) - public void update(StaffAgencyHistoryDTO dto) { - StaffAgencyHistoryEntity entity = ConvertUtils.sourceToTarget(dto, StaffAgencyHistoryEntity.class); + public void update(StaffAgencyVisitedDTO dto) { + StaffAgencyVisitedEntity entity = ConvertUtils.sourceToTarget(dto, StaffAgencyVisitedEntity.class); updateById(entity); } @@ -114,7 +114,7 @@ public class StaffAgencyHistoryServiceImpl 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.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dao.StaffGridVisitedDao; +import com.epmet.dto.StaffGridVisitedDTO; +import com.epmet.entity.StaffGridVisitedEntity; +import com.epmet.service.StaffGridVisitedService; +import org.apache.commons.lang3.StringUtils; +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-04-21 + */ +@Service +public class StaffGridVisitedServiceImpl extends BaseServiceImpl implements StaffGridVisitedService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, StaffGridVisitedDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, StaffGridVisitedDTO.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 StaffGridVisitedDTO get(String id) { + StaffGridVisitedEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, StaffGridVisitedDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(StaffGridVisitedDTO dto) { + StaffGridVisitedEntity entity = ConvertUtils.sourceToTarget(dto, StaffGridVisitedEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(StaffGridVisitedDTO dto) { + StaffGridVisitedEntity entity = ConvertUtils.sourceToTarget(dto, StaffGridVisitedEntity.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-user/epmet-user-server/src/main/resources/db/migration/epmet_user.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/epmet_user.sql index 90e2427edd..9283e23220 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/epmet_user.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/epmet_user.sql @@ -57,13 +57,13 @@ CREATE TABLE `staff_login_history` ( drop table if EXISTS staff_login_history; -CREATE TABLE `staff_agency_history` ( +CREATE TABLE `staff_agency_visited` ( `ID` varchar(64) NOT NULL COMMENT '唯一标识', `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', `STAFF_ID` varchar(64) NOT NULL COMMENT 'customer_staff.userId', `WX_OPEN_ID` varchar(64) NOT NULL COMMENT '微信openId', `MOBILE` varchar(20) NOT NULL COMMENT '手机号', - `ORG_ID` varchar(64) NOT NULL COMMENT '组织机构id', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '机关单位id来源于customer_agency.id', `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识：0.未删除 1.已删除', `REVISION` int(11) NOT NULL COMMENT '乐观锁', `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', @@ -71,4 +71,18 @@ CREATE TABLE `staff_agency_history` ( `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新人', `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', PRIMARY KEY (`ID`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='工作人员登录组织日志表'; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='工作人员进入组织日志表'; + +CREATE TABLE `staff_grid_visited` ( + `ID` varchar(64) NOT NULL COMMENT '唯一标识', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `GRID_ID` varchar(64) NOT NULL COMMENT '网格ID', + `STAFF_ID` varchar(64) NOT NULL COMMENT 'customer_staff.userId', + `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识：0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间,登录时间', + `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新人', + `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='工作人员进入网格日志表'; \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffAgencyHistoryDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffAgencyVisitedDao.xml similarity index 86% rename from epmet-user/epmet-user-server/src/main/resources/mapper/StaffAgencyHistoryDao.xml rename to epmet-user/epmet-user-server/src/main/resources/mapper/StaffAgencyVisitedDao.xml index a9ce119bff..687edca880 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffAgencyHistoryDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffAgencyVisitedDao.xml @@ -1,15 +1,15 @@ - + - + - + diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffGridVisitedDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffGridVisitedDao.xml new file mode 100644 index 0000000000..38ce0bff3c --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffGridVisitedDao.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file