diff --git a/epdc-cloud-admin/pom.xml b/epdc-cloud-admin/pom.xml index ce6485a..6c41c95 100644 --- a/epdc-cloud-admin/pom.xml +++ b/epdc-cloud-admin/pom.xml @@ -84,10 +84,10 @@ ${epdc-cloud-client.version} - + com.esua.epdc.yushan - epdc-cloud-optimize-department + epdc-optimize-dept-macode 1.0.0 diff --git a/epdc-cloud-admin/src/main/resources/application-test.yml b/epdc-cloud-admin/src/main/resources/application-test.yml index 847562a..2714d19 100644 --- a/epdc-cloud-admin/src/main/resources/application-test.yml +++ b/epdc-cloud-admin/src/main/resources/application-test.yml @@ -8,8 +8,8 @@ spring: datasource: druid: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: epdc + url: jdbc:mysql://47.104.224.45:3308/yushan_esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + username: epdcyushan password: elink833066 initial-size: 10 max-active: 100 diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 9abae9c..820d1e4 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 9abae9c811a1a58f36364c4ad17ad3962e1dda01 +Subproject commit 820d1e418e28da9cc383ccd6c8489cbdf22c29f4 diff --git a/epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/excel/DeptMaCodeExcel.java b/epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/excel/DeptMaCodeExcel.java deleted file mode 100644 index ed5317b..0000000 --- a/epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/excel/DeptMaCodeExcel.java +++ /dev/null @@ -1,80 +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.elink.esua.epdc.optimize.modules.macode.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 网格小程序码 - * - * @author elink elink@elink-cn.com - * @since v1.0.0 2020-05-15 - */ -@Data -public class DeptMaCodeExcel { - - @Excel(name = "主键") - private String id; - - @Excel(name = "网格ID") - private Long gridId; - - @Excel(name = "小程序码URL") - private String codeUrl; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - @Excel(name = "删除标记") - private String delFlag; - - @Excel(name = "是否是网格长码,0否 1是") - private String leaderFlag; - - @Excel(name = "网格名称") - private String grid; - - @Excel(name = "父所有部门") - private String parentDeptIds; - - @Excel(name = "父所有部门") - private String parentDeptNames; - - @Excel(name = "所有部门ID") - private String allDeptIds; - - @Excel(name = "所有部门名称") - private String allDeptNames; - - -} \ No newline at end of file diff --git a/epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/redis/DeptMaCodeRedis.java b/epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/redis/DeptMaCodeRedis.java deleted file mode 100644 index 9bcdccd..0000000 --- a/epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/redis/DeptMaCodeRedis.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.elink.esua.epdc.optimize.modules.macode.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 网格小程序码 - * - * @author elink elink@elink-cn.com - * @since v1.0.0 2020-05-15 - */ -@Component -public class DeptMaCodeRedis { - @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/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/pom.xml b/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/pom.xml new file mode 100644 index 0000000..6c63a61 --- /dev/null +++ b/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/pom.xml @@ -0,0 +1,91 @@ + + + + epdc-cloud-optimize-yushan + com.esua.epdc.yushan + 1.0.0 + + 4.0.0 + + epdc-optimize-dept-level + 部门层级关系功能优化 + jar + + + + + com.esua.epdc.yushan + epdc-cloud-admin-client + ${epdc-cloud-commons.version} + + + org.springframework.boot + spring-boot-autoconfigure + compile + + + com.esua.epdc.yushan + epdc-commons-mybatis + ${epdc-cloud-commons.version} + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework + spring-context-support + + + + + ${project.artifactId} + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + com.spotify + dockerfile-maven-plugin + + + + ${project.basedir}/src/main/java + + + + true + ${basedir}/src/main/resources + + **/application*.yml + **/*.properties + logback-spring.xml + registry.conf + + + + ${basedir}/src/main/resources + + **/application*.yml + **/*.properties + logback-spring.xml + registry.conf + + + + + + \ No newline at end of file diff --git a/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/java/com/elink/esua/epdc/optimize/deptlevel/controller/OptDeptLevelController.java b/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/java/com/elink/esua/epdc/optimize/deptlevel/controller/OptDeptLevelController.java new file mode 100644 index 0000000..0a4c26c --- /dev/null +++ b/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/java/com/elink/esua/epdc/optimize/deptlevel/controller/OptDeptLevelController.java @@ -0,0 +1,17 @@ +package com.elink.esua.epdc.optimize.deptlevel.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 部门层级相关调用 + * + * @author work@yujt.net.cn + * @date 2020/5/21 09:58 + */ +@RestController +@RequestMapping("optimize/deptlevel") +public class OptDeptLevelController { + + +} diff --git a/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/java/com/elink/esua/epdc/optimize/deptlevel/dao/OptSysDeptDao.java b/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/java/com/elink/esua/epdc/optimize/deptlevel/dao/OptSysDeptDao.java new file mode 100644 index 0000000..2ddca5b --- /dev/null +++ b/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/java/com/elink/esua/epdc/optimize/deptlevel/dao/OptSysDeptDao.java @@ -0,0 +1,13 @@ +package com.elink.esua.epdc.optimize.deptlevel.dao; + +import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.optimize.deptlevel.entity.OptSysDeptEntity; + +/** + * 部门相关 + * + * @author work@yujt.net.cn + * @date 2020/5/21 10:11 + */ +public interface OptSysDeptDao extends BaseDao { +} diff --git a/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/java/com/elink/esua/epdc/optimize/deptlevel/entity/OptSysDeptEntity.java b/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/java/com/elink/esua/epdc/optimize/deptlevel/entity/OptSysDeptEntity.java new file mode 100644 index 0000000..37922e9 --- /dev/null +++ b/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/java/com/elink/esua/epdc/optimize/deptlevel/entity/OptSysDeptEntity.java @@ -0,0 +1,72 @@ +package com.elink.esua.epdc.optimize.deptlevel.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.elink.esua.epdc.commons.mybatis.entity.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * @author work@yujt.net.cn + * @date + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("sys_dept") +public class OptSysDeptEntity extends BaseEntity { + + private static final long serialVersionUID = -6288907401246811269L; + + /** + * 上级ID + */ + private Long pid; + /** + * 所有上级ID，用逗号分开 + */ + private String pids; + /** + * 部门名称 + */ + private String name; + /** + * 排序 + */ + private Integer sort; + /** + * 删除标识 0：未删除 1：删除 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + private Integer delFlag; + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long updater; + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateDate; + + /** + * 上级部门名称 + */ + @TableField(exist = false) + private String parentName; + + /** + * 部门类型键值 + */ + private String typeKey; + + /** + * 部门编码 + */ + private String partyCode; +} diff --git a/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/java/com/elink/esua/epdc/optimize/deptlevel/service/OptSysDeptService.java b/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/java/com/elink/esua/epdc/optimize/deptlevel/service/OptSysDeptService.java new file mode 100644 index 0000000..0b3692f --- /dev/null +++ b/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/java/com/elink/esua/epdc/optimize/deptlevel/service/OptSysDeptService.java @@ -0,0 +1,13 @@ +package com.elink.esua.epdc.optimize.deptlevel.service; + +import com.elink.esua.epdc.commons.mybatis.service.BaseService; +import com.elink.esua.epdc.optimize.deptlevel.entity.OptSysDeptEntity; + +/** + * 部门相关 + * + * @author work@yujt.net.cn + * @date 2020/5/21 10:11 + */ +public interface OptSysDeptService extends BaseService { +} diff --git a/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/java/com/elink/esua/epdc/optimize/deptlevel/service/impl/OptSysDeptServiceImpl.java b/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/java/com/elink/esua/epdc/optimize/deptlevel/service/impl/OptSysDeptServiceImpl.java new file mode 100644 index 0000000..094eaf9 --- /dev/null +++ b/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/java/com/elink/esua/epdc/optimize/deptlevel/service/impl/OptSysDeptServiceImpl.java @@ -0,0 +1,17 @@ +package com.elink.esua.epdc.optimize.deptlevel.service.impl; + +import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.optimize.deptlevel.dao.OptSysDeptDao; +import com.elink.esua.epdc.optimize.deptlevel.entity.OptSysDeptEntity; +import com.elink.esua.epdc.optimize.deptlevel.service.OptSysDeptService; + +/** + * 部门相关业务实现 + * + * @author work@yujt.net.cn + * @date 2020/5/21 10:12 + */ +public class OptSysDeptServiceImpl extends BaseServiceImpl implements OptSysDeptService { + + +} diff --git a/epdc-cloud-optimize-department/src/main/resources/application.yml b/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/resources/application.yml similarity index 92% rename from epdc-cloud-optimize-department/src/main/resources/application.yml rename to epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/resources/application.yml index 1070a5d..2299de9 100644 --- a/epdc-cloud-optimize-department/src/main/resources/application.yml +++ b/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/resources/application.yml @@ -1,8 +1,7 @@ - mybatis-plus: mapper-locations: classpath:/mapper/**/*.xml #实体扫描，多个package用逗号或者分号分隔 - typeAliasesPackage: com.elink.esua.epdc.optimize.modules.*.entity + typeAliasesPackage: com.elink.esua.epdc.optimize.deptlevel.entity global-config: #数据库相关配置 db-config: diff --git a/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/resources/logback-spring.xml b/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..58a74f1 --- /dev/null +++ b/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/resources/logback-spring.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/resources/mapper/OptSysDeptDao.xml b/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/resources/mapper/OptSysDeptDao.xml new file mode 100644 index 0000000..b6648fa --- /dev/null +++ b/epdc-cloud-optimize-yushan/epdc-optimize-dept-level/src/main/resources/mapper/OptSysDeptDao.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/epdc-cloud-optimize-department/pom.xml b/epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/pom.xml similarity index 83% rename from epdc-cloud-optimize-department/pom.xml rename to epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/pom.xml index 7b313c9..89d214c 100644 --- a/epdc-cloud-optimize-department/pom.xml +++ b/epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/pom.xml @@ -3,17 +3,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + epdc-cloud-optimize-yushan com.esua.epdc.yushan - epdc-cloud-parent-yushan 1.0.0 - ../epdc-cloud-parent-yushan 4.0.0 - 1.0.0 - epdc-cloud-optimize-department + epdc-optimize-dept-macode + 小程序码维护功能优化 jar - 党群e家部门机构优化微服务模块 @@ -50,23 +48,12 @@ epdc-commons-api-version-control ${epdc-cloud-commons.version} - - - - com.esua.epdc.yushan - epdc-cloud-admin-client - ${epdc-cloud-client.version} - ${project.artifactId} - org.apache.maven.plugins maven-surefire-plugin diff --git a/epdc-cloud-optimize-department/src/db/update.sql b/epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/db/update.sql similarity index 100% rename from epdc-cloud-optimize-department/src/db/update.sql rename to epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/db/update.sql diff --git a/epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/controller/OptDeptMaCodeController.java b/epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/controller/OptDeptMaCodeController.java similarity index 77% rename from epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/controller/OptDeptMaCodeController.java rename to epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/controller/OptDeptMaCodeController.java index 4db776c..1740208 100644 --- a/epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/controller/OptDeptMaCodeController.java +++ b/epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/controller/OptDeptMaCodeController.java @@ -15,25 +15,20 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.optimize.modules.macode.controller; +package com.elink.esua.epdc.optimize.macode.controller; +import com.elink.esua.epdc.optimize.macode.dto.OptDeptMaCodeDTO; +import com.elink.esua.epdc.optimize.macode.service.OptDeptMaCodeService; import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.dto.DeptMaCodeDTO; -import com.elink.esua.epdc.optimize.modules.macode.dto.OptDeptMaCodeDTO; -import com.elink.esua.epdc.optimize.modules.macode.excel.DeptMaCodeExcel; -import com.elink.esua.epdc.optimize.modules.macode.service.OptDeptMaCodeService; 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; @@ -57,13 +52,13 @@ public class OptDeptMaCodeController { } @GetMapping("{id}") - public Result get(@PathVariable("id") String id) { - DeptMaCodeDTO data = deptMaCodeService.get(id); - return new Result().ok(data); + public Result get(@PathVariable("id") String id) { + OptDeptMaCodeDTO data = deptMaCodeService.get(id); + return new Result().ok(data); } @PostMapping - public Result save(@RequestBody DeptMaCodeDTO dto) { + public Result save(@RequestBody OptDeptMaCodeDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); deptMaCodeService.save(dto); @@ -71,7 +66,7 @@ public class OptDeptMaCodeController { } @PutMapping - public Result update(@RequestBody DeptMaCodeDTO dto) { + public Result update(@RequestBody OptDeptMaCodeDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); deptMaCodeService.update(dto); @@ -86,12 +81,6 @@ public class OptDeptMaCodeController { return new Result(); } - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = deptMaCodeService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, DeptMaCodeExcel.class); - } - /** * 将网格机构信息同步到小程序码表（只是同步机构信息，不会创建小程序码） * diff --git a/epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dao/OptDeptMaCodeDao.java b/epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/dao/OptDeptMaCodeDao.java similarity index 80% rename from epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dao/OptDeptMaCodeDao.java rename to epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/dao/OptDeptMaCodeDao.java index 7f255b3..1dc05d6 100644 --- a/epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dao/OptDeptMaCodeDao.java +++ b/epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/dao/OptDeptMaCodeDao.java @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.optimize.modules.macode.dao; +package com.elink.esua.epdc.optimize.macode.dao; +import com.elink.esua.epdc.optimize.macode.dto.OptDeptMaCodeDTO; +import com.elink.esua.epdc.optimize.macode.entity.OptDeptMaCodeEntity; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.optimize.modules.macode.dto.OptDeptMaCodeDTO; -import com.elink.esua.epdc.optimize.modules.macode.entity.OptDeptMaCodeEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -40,7 +40,7 @@ public interface OptDeptMaCodeDao extends BaseDao { * * @param dataScopeDeptIds 用户部门数据权限 * @param typeKey 机构类型{@link com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant} - * @return java.util.List + * @return java.util.List * @author work@yujt.net.cn * @date 2020/5/15 13:58 */ @@ -51,7 +51,7 @@ public interface OptDeptMaCodeDao extends BaseDao { * * @param deptId 机构id * @param parentIds 父机构id - * @return java.util.List + * @return java.util.List * @author work@yujt.net.cn * @date 2020/5/15 14:10 */ @@ -61,7 +61,7 @@ public interface OptDeptMaCodeDao extends BaseDao { * 小程序码维护 - 分页查询 * * @param params - * @return java.util.List + * @return java.util.List * @author work@yujt.net.cn * @date 2020/5/18 14:35 */ diff --git a/epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dto/OptDeptMaCodeDTO.java b/epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/dto/OptDeptMaCodeDTO.java similarity index 97% rename from epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dto/OptDeptMaCodeDTO.java rename to epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/dto/OptDeptMaCodeDTO.java index 2dba190..c57b30e 100644 --- a/epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dto/OptDeptMaCodeDTO.java +++ b/epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/dto/OptDeptMaCodeDTO.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.optimize.modules.macode.dto; +package com.elink.esua.epdc.optimize.macode.dto; import java.io.Serializable; import java.util.Date; diff --git a/epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/dto/UploadToOssDTO.java b/epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/dto/UploadToOssDTO.java new file mode 100644 index 0000000..ec27755 --- /dev/null +++ b/epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/dto/UploadToOssDTO.java @@ -0,0 +1,19 @@ +package com.elink.esua.epdc.optimize.macode.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author: zy + * @Date: 2020-03-17 + */ +@Data +public class UploadToOssDTO implements Serializable { + + private static final long serialVersionUID = 6136753578748343389L; + + private String fileName; + + private byte[] fileByte; +} diff --git a/epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/entity/OptDeptMaCodeEntity.java b/epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/entity/OptDeptMaCodeEntity.java similarity index 95% rename from epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/entity/OptDeptMaCodeEntity.java rename to epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/entity/OptDeptMaCodeEntity.java index 1df8024..b5a7d89 100644 --- a/epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/entity/OptDeptMaCodeEntity.java +++ b/epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/entity/OptDeptMaCodeEntity.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.optimize.modules.macode.entity; +package com.elink.esua.epdc.optimize.macode.entity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/feign/OptOssFeignClient.java b/epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/feign/OptOssFeignClient.java similarity index 81% rename from epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/feign/OptOssFeignClient.java rename to epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/feign/OptOssFeignClient.java index 04c1690..05f50c2 100644 --- a/epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/feign/OptOssFeignClient.java +++ b/epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/feign/OptOssFeignClient.java @@ -1,9 +1,9 @@ -package com.elink.esua.epdc.optimize.modules.feign; +package com.elink.esua.epdc.optimize.macode.feign; +import com.elink.esua.epdc.optimize.macode.feign.fallback.OptOssFeignClientFallback; +import com.elink.esua.epdc.optimize.macode.dto.UploadToOssDTO; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.UploadToOssDTO; -import com.elink.esua.epdc.optimize.modules.feign.fallback.OptOssFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; diff --git a/epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/feign/fallback/OptOssFeignClientFallback.java b/epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/feign/fallback/OptOssFeignClientFallback.java similarity index 74% rename from epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/feign/fallback/OptOssFeignClientFallback.java rename to epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/feign/fallback/OptOssFeignClientFallback.java index ef021b4..052c11d 100644 --- a/epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/feign/fallback/OptOssFeignClientFallback.java +++ b/epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/feign/fallback/OptOssFeignClientFallback.java @@ -1,10 +1,10 @@ -package com.elink.esua.epdc.optimize.modules.feign.fallback; +package com.elink.esua.epdc.optimize.macode.feign.fallback; +import com.elink.esua.epdc.optimize.macode.feign.OptOssFeignClient; +import com.elink.esua.epdc.optimize.macode.dto.UploadToOssDTO; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.UploadToOssDTO; -import com.elink.esua.epdc.optimize.modules.feign.OptOssFeignClient; import org.springframework.stereotype.Component; /** diff --git a/epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/service/OptDeptMaCodeService.java b/epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/service/OptDeptMaCodeService.java similarity index 86% rename from epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/service/OptDeptMaCodeService.java rename to epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/service/OptDeptMaCodeService.java index 11a3c46..af26068 100644 --- a/epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/service/OptDeptMaCodeService.java +++ b/epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/service/OptDeptMaCodeService.java @@ -15,14 +15,13 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.optimize.modules.macode.service; +package com.elink.esua.epdc.optimize.macode.service; +import com.elink.esua.epdc.optimize.macode.dto.OptDeptMaCodeDTO; +import com.elink.esua.epdc.optimize.macode.entity.OptDeptMaCodeEntity; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.DeptMaCodeDTO; -import com.elink.esua.epdc.optimize.modules.macode.dto.OptDeptMaCodeDTO; -import com.elink.esua.epdc.optimize.modules.macode.entity.OptDeptMaCodeEntity; import java.util.List; import java.util.Map; @@ -53,7 +52,7 @@ public interface OptDeptMaCodeService extends BaseService { * @author generator * @date 2020-05-15 */ - List list(Map params); + List list(Map params); /** * 单条查询 @@ -63,7 +62,7 @@ public interface OptDeptMaCodeService extends BaseService { * @author generator * @date 2020-05-15 */ - DeptMaCodeDTO get(String id); + OptDeptMaCodeDTO get(String id); /** * 默认保存 @@ -73,7 +72,7 @@ public interface OptDeptMaCodeService extends BaseService { * @author generator * @date 2020-05-15 */ - void save(DeptMaCodeDTO dto); + void save(OptDeptMaCodeDTO dto); /** * 默认更新 @@ -83,7 +82,7 @@ public interface OptDeptMaCodeService extends BaseService { * @author generator * @date 2020-05-15 */ - void update(DeptMaCodeDTO dto); + void update(OptDeptMaCodeDTO dto); /** * 批量删除 diff --git a/epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/service/impl/OptDeptMaCodeServiceImpl.java b/epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/service/impl/OptDeptMaCodeServiceImpl.java similarity index 90% rename from epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/service/impl/OptDeptMaCodeServiceImpl.java rename to epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/service/impl/OptDeptMaCodeServiceImpl.java index c79ff63..bb278a2 100644 --- a/epdc-cloud-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/service/impl/OptDeptMaCodeServiceImpl.java +++ b/epdc-cloud-optimize-yushan/epdc-optimize-dept-macode/src/main/java/com/elink/esua/epdc/optimize/macode/service/impl/OptDeptMaCodeServiceImpl.java @@ -15,13 +15,19 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.optimize.modules.macode.service.impl; +package com.elink.esua.epdc.optimize.macode.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.elink.esua.epdc.optimize.macode.feign.OptOssFeignClient; +import com.elink.esua.epdc.optimize.macode.dao.OptDeptMaCodeDao; +import com.elink.esua.epdc.optimize.macode.dto.OptDeptMaCodeDTO; +import com.elink.esua.epdc.optimize.macode.dto.UploadToOssDTO; +import com.elink.esua.epdc.optimize.macode.entity.OptDeptMaCodeEntity; +import com.elink.esua.epdc.optimize.macode.service.OptDeptMaCodeService; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; @@ -33,14 +39,7 @@ import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.DeptMaCodeDTO; -import com.elink.esua.epdc.dto.UploadToOssDTO; -import com.elink.esua.epdc.optimize.modules.feign.OptOssFeignClient; -import com.elink.esua.epdc.optimize.modules.macode.dao.OptDeptMaCodeDao; -import com.elink.esua.epdc.optimize.modules.macode.dto.OptDeptMaCodeDTO; -import com.elink.esua.epdc.optimize.modules.macode.entity.OptDeptMaCodeEntity; -import com.elink.esua.epdc.optimize.modules.macode.service.OptDeptMaCodeService; -import com.elink.esua.epdc.optimize.utils.FileUtils; +import com.elink.esua.epdc.optimize.macode.utils.FileUtils; import com.elink.esua.epdc.utils.WxMaServiceUtils; import com.google.common.collect.Lists; import me.chanjar.weixin.common.error.WxErrorException; @@ -163,7 +162,7 @@ public class OptDeptMaCodeServiceImpl extends BaseServiceImpl list(Map params) { + public List list(Map params) { List entityList = baseDao.selectList(getWrapper(params)); - return ConvertUtils.sourceToTarget(entityList, DeptMaCodeDTO.class); + return ConvertUtils.sourceToTarget(entityList, OptDeptMaCodeDTO.class); } private QueryWrapper getWrapper(Map params) { @@ -236,21 +235,21 @@ public class OptDeptMaCodeServiceImpl extends BaseServiceImpl - +