From 51f1bd77508438d28c27931680e0711826a04389 Mon Sep 17 00:00:00 2001 From: xiangwbs Date: Thu, 21 Jun 2018 20:27:07 +0800 Subject: [PATCH] merge --- boot-service/pom.xml | 9 ++- .../main/java/com/xwbing/demo/sql/sql02.sql | 4 +- .../domain/entity/rest/FilesUpload.java | 7 +- .../domain/entity/sys/DataDictionary.java | 3 +- .../domain/entity/sys/SysAuthority.java | 1 + .../xwbing/domain/entity/sys/SysConfig.java | 3 +- .../com/xwbing/domain/entity/sys/SysRole.java | 1 + .../domain/entity/sys/SysRoleAuthority.java | 1 + .../com/xwbing/domain/entity/sys/SysUser.java | 1 + .../domain/entity/sys/SysUserLoginInOut.java | 1 + .../xwbing/domain/entity/sys/SysUserRole.java | 1 + .../domain/mapper/rest/FilesUploadMapper.java | 17 ++++ .../{sys => }/DataDictionaryRepository.java | 2 +- .../repository/FilesUploadRepository.java | 19 ----- .../{sys => }/SysConfigRepository.java | 2 +- .../sys/SysAuthorityRepository.java | 28 ------- .../sys/SysRoleAuthorityRepository.java | 16 ---- .../repository/sys/SysRoleRepository.java | 22 ------ .../sys/SysUserLoginInOutRepository.java | 16 ---- .../repository/sys/SysUserRepository.java | 13 ---- .../repository/sys/SysUserRoleRepository.java | 16 ---- .../main/java/com/xwbing/rabbit/Sender.java | 4 - .../xwbing/service/rest/CommonService.java | 15 ++-- .../service/sys/DataDictionaryService.java | 7 +- .../service/sys/SysAuthorityService.java | 4 + .../xwbing/service/sys/SysConfigService.java | 5 +- .../xwbing/service/sys/SysRoleService.java | 4 + .../xwbing/service/sys/SysUserService.java | 3 + .../resources/mapper/rest/FilesUpload.xml | 78 +++++++++++++++++++ .../resources/mapper/sys/SysAuthority.xml | 3 - .../src/main/resources/mapper/sys/SysUser.xml | 7 +- .../mapper/sys/SysUserLoginInOut.xml | 2 +- .../src/main/resources/mapper/sys/sysRole.xml | 6 +- .../src/main/resources/redis.properties | 15 ++-- .../xwbing/controller/rest/TestControl.java | 10 ++- .../xwbing/controller/sys/CommonControl.java | 4 +- .../com/xwbing/handler/FormRepeatFilter.java | 2 +- boot-web/src/main/resources/config.properties | 12 +-- .../java/com/xwbing/service/ServiceTest.java | 24 +++--- 39 files changed, 177 insertions(+), 211 deletions(-) create mode 100644 boot-service/src/main/java/com/xwbing/domain/mapper/rest/FilesUploadMapper.java rename boot-service/src/main/java/com/xwbing/domain/repository/{sys => }/DataDictionaryRepository.java (93%) delete mode 100644 boot-service/src/main/java/com/xwbing/domain/repository/FilesUploadRepository.java rename boot-service/src/main/java/com/xwbing/domain/repository/{sys => }/SysConfigRepository.java (90%) delete mode 100644 boot-service/src/main/java/com/xwbing/domain/repository/sys/SysAuthorityRepository.java delete mode 100644 boot-service/src/main/java/com/xwbing/domain/repository/sys/SysRoleAuthorityRepository.java delete mode 100644 boot-service/src/main/java/com/xwbing/domain/repository/sys/SysRoleRepository.java delete mode 100644 boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserLoginInOutRepository.java delete mode 100644 boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserRepository.java delete mode 100644 boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserRoleRepository.java create mode 100644 boot-service/src/main/resources/mapper/rest/FilesUpload.xml diff --git a/boot-service/pom.xml b/boot-service/pom.xml index 9b10f76..3f032ce 100644 --- a/boot-service/pom.xml +++ b/boot-service/pom.xml @@ -56,12 +56,17 @@ org.mybatis.spring.boot mybatis-spring-boot-starter - 1.3.0 + 1.3.1 + + + tk.mybatis + mapper-spring-boot-starter + 1.2.4 com.github.pagehelper pagehelper-spring-boot-starter - 1.1.2 + 1.2.3 diff --git a/boot-service/src/main/java/com/xwbing/demo/sql/sql02.sql b/boot-service/src/main/java/com/xwbing/demo/sql/sql02.sql index 2ffed7c..f59bd84 100644 --- a/boot-service/src/main/java/com/xwbing/demo/sql/sql02.sql +++ b/boot-service/src/main/java/com/xwbing/demo/sql/sql02.sql @@ -111,8 +111,8 @@ TO_CHAR SELECT TO_CHAR(SYSDATE,'YYYY-MM-DD HH24:MI:SS') FROM DUAL; SELECT TO_DATE('1992-9-1 23:22:11','RR-mm-dd hh24:mi:ss') FROM dual; SELECT TO_CHAR(TO_DATE('99-09-01','RR-MM-DD'),'YYYY-MM-DD') FROM DUAL; -SELECT date_format(now(),'%Y-%m-%d %h:%i:%s');//mysql-------------------------------------- -SELECT str_to_date('2016-01-02 11:11:11','%Y-%m-%d %h:%i:%s');//mysql-------------------------------------- +SELECT date_format(now(),'%Y-%m-%d %H:%i:%s');//mysql-------------------------------------- +SELECT str_to_date('2016-01-02 11:11:11','%Y-%m-%d %H:%i:%s');//mysql-------------------------------------- LAST_DAY(date) 该函数返回给定日期所在月的最后一天 查看当月月底? diff --git a/boot-service/src/main/java/com/xwbing/domain/entity/rest/FilesUpload.java b/boot-service/src/main/java/com/xwbing/domain/entity/rest/FilesUpload.java index dd04c89..c15511f 100644 --- a/boot-service/src/main/java/com/xwbing/domain/entity/rest/FilesUpload.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/rest/FilesUpload.java @@ -1,19 +1,16 @@ package com.xwbing.domain.entity.rest; -import com.xwbing.domain.entity.sys.JpaBaseEntity; +import com.xwbing.domain.entity.sys.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Entity; - /** * @author xiangwb * @version $Id: FilesUpload.java, v 0.1 2018年06月13日 17:23 wb-xwb402636 Exp $ */ @EqualsAndHashCode(callSuper = true) @Data -@Entity(name = "file_upload") -public class FilesUpload extends JpaBaseEntity { +public class FilesUpload extends BaseEntity { private static final long serialVersionUID = 3284231281346882055L; public static String table = "file_upload"; private String name; diff --git a/boot-service/src/main/java/com/xwbing/domain/entity/sys/DataDictionary.java b/boot-service/src/main/java/com/xwbing/domain/entity/sys/DataDictionary.java index 6395cce..829df05 100644 --- a/boot-service/src/main/java/com/xwbing/domain/entity/sys/DataDictionary.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/sys/DataDictionary.java @@ -16,9 +16,8 @@ import javax.persistence.Entity; @EqualsAndHashCode(callSuper = true) @Data @Entity(name = "data_dict") -public class DataDictionary extends BaseEntity { +public class DataDictionary extends JpaBaseEntity { private static final long serialVersionUID = -3409347240188002427L; - public static String table = "data_dict"; @ApiModelProperty(value = "编码", required = true) private String code; @ApiModelProperty(value = "名称", required = true) diff --git a/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysAuthority.java b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysAuthority.java index 08e7276..9db3841 100644 --- a/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysAuthority.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysAuthority.java @@ -13,6 +13,7 @@ import javax.persistence.Entity; * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ +@EqualsAndHashCode(callSuper = true) @Data public class SysAuthority extends BaseEntity { private static final long serialVersionUID = -6469518352117371987L; diff --git a/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysConfig.java b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysConfig.java index e435c3c..85c209e 100644 --- a/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysConfig.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysConfig.java @@ -19,10 +19,9 @@ import javax.validation.constraints.Pattern; @EqualsAndHashCode(callSuper = true) @Data @Entity(name = "system_config") -@ApiModel//swagger +@ApiModel public class SysConfig extends BaseEntity { private static final long serialVersionUID = -7587016038432881980L; - public static String table = "system_config"; @ApiModelProperty(value = "配置项的code",example = "email_config",required = true) @NotBlank(message = "配置项的code不能为空") @Length(min = 1, max = 50, message = "code长度为1-50") diff --git a/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysRole.java b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysRole.java index 4efc3d3..54d3563 100644 --- a/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysRole.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysRole.java @@ -12,6 +12,7 @@ import javax.persistence.Entity; * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ +@EqualsAndHashCode(callSuper = true) @Data public class SysRole extends BaseEntity { private static final long serialVersionUID = -3048021197170624143L; diff --git a/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysRoleAuthority.java b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysRoleAuthority.java index 423f810..8688d2a 100644 --- a/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysRoleAuthority.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysRoleAuthority.java @@ -12,6 +12,7 @@ import javax.persistence.Entity; * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ +@EqualsAndHashCode(callSuper = true) @Data public class SysRoleAuthority extends BaseEntity { private static final long serialVersionUID = 1241064470335852429L; diff --git a/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUser.java b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUser.java index 10daccd..57b6d83 100644 --- a/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUser.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUser.java @@ -19,6 +19,7 @@ import java.util.List; * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ +@EqualsAndHashCode(callSuper = true) @Data @ApiModel public class SysUser extends BaseEntity { diff --git a/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUserLoginInOut.java b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUserLoginInOut.java index 0f7b420..9aff812 100644 --- a/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUserLoginInOut.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUserLoginInOut.java @@ -12,6 +12,7 @@ import javax.persistence.Entity; * 作者: xiangwb * 说明: 用户登录登出信息 */ +@EqualsAndHashCode(callSuper = true) @Data public class SysUserLoginInOut extends BaseEntity { private static final long serialVersionUID = -2719103095945780275L; diff --git a/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUserRole.java b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUserRole.java index 51cb29e..17fed82 100644 --- a/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUserRole.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUserRole.java @@ -12,6 +12,7 @@ import javax.persistence.Entity; * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ +@EqualsAndHashCode(callSuper = true) @Data public class SysUserRole extends BaseEntity { private static final long serialVersionUID = 7340808603856635810L; diff --git a/boot-service/src/main/java/com/xwbing/domain/mapper/rest/FilesUploadMapper.java b/boot-service/src/main/java/com/xwbing/domain/mapper/rest/FilesUploadMapper.java new file mode 100644 index 0000000..1e4b095 --- /dev/null +++ b/boot-service/src/main/java/com/xwbing/domain/mapper/rest/FilesUploadMapper.java @@ -0,0 +1,17 @@ +package com.xwbing.domain.mapper.rest; + +import com.xwbing.domain.entity.rest.FilesUpload; +import com.xwbing.domain.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 项目名称: boot-module-demo + * 创建时间: 2018/6/1 21:50 + * 作者: xiangwb + * 说明: + */ +public interface FilesUploadMapper extends BaseMapper { + List findByName(@Param("name") String name, @Param("type") String type); +} diff --git a/boot-service/src/main/java/com/xwbing/domain/repository/sys/DataDictionaryRepository.java b/boot-service/src/main/java/com/xwbing/domain/repository/DataDictionaryRepository.java similarity index 93% rename from boot-service/src/main/java/com/xwbing/domain/repository/sys/DataDictionaryRepository.java rename to boot-service/src/main/java/com/xwbing/domain/repository/DataDictionaryRepository.java index 1d18ce3..934ecf6 100644 --- a/boot-service/src/main/java/com/xwbing/domain/repository/sys/DataDictionaryRepository.java +++ b/boot-service/src/main/java/com/xwbing/domain/repository/DataDictionaryRepository.java @@ -1,4 +1,4 @@ -package com.xwbing.domain.repository.sys; +package com.xwbing.domain.repository; import com.xwbing.domain.entity.sys.DataDictionary; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/boot-service/src/main/java/com/xwbing/domain/repository/FilesUploadRepository.java b/boot-service/src/main/java/com/xwbing/domain/repository/FilesUploadRepository.java deleted file mode 100644 index 49f9356..0000000 --- a/boot-service/src/main/java/com/xwbing/domain/repository/FilesUploadRepository.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.xwbing.domain.repository; - -import com.xwbing.domain.entity.rest.FilesUpload; -import org.springframework.data.domain.Sort; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -/** - * @author xiangwb - * @version $Id: FilesUploadRepository.java, v 0.1 2018年06月13日 17:25 wb-xwb402636 Exp $ - */ -public interface FilesUploadRepository extends JpaRepository { - List getByName(String name, Sort sort); - - List getByTypeOrderByCreateTime(String type); - - List getByIdIn(List ids); -} diff --git a/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysConfigRepository.java b/boot-service/src/main/java/com/xwbing/domain/repository/SysConfigRepository.java similarity index 90% rename from boot-service/src/main/java/com/xwbing/domain/repository/sys/SysConfigRepository.java rename to boot-service/src/main/java/com/xwbing/domain/repository/SysConfigRepository.java index ed699f9..5f9ef57 100644 --- a/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysConfigRepository.java +++ b/boot-service/src/main/java/com/xwbing/domain/repository/SysConfigRepository.java @@ -1,4 +1,4 @@ -package com.xwbing.domain.repository.sys; +package com.xwbing.domain.repository; import com.xwbing.domain.entity.sys.SysConfig; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysAuthorityRepository.java b/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysAuthorityRepository.java deleted file mode 100644 index 538dc5a..0000000 --- a/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysAuthorityRepository.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.xwbing.domain.repository.sys; - -import com.xwbing.domain.entity.sys.SysAuthority; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -/** - * 说明: - * 项目名称: boot-module-demo - * 创建时间: 2017/5/5 16:44 - * 作者: xiangwb - */ -public interface SysAuthorityRepository extends JpaRepository { - SysAuthority getByCode(String code); - - List getByEnableOrderBySort(String enable); - - List getByParentIdAndEnableOrderBySort(String parentId, String enable); - - List getByParentIdOrderBySort(String parentId); - - List getByEnableAndIdInOrderBySort(String enable, List ids); - - List getByIdInOrderBySort(List ids); - - SysAuthority getBySort(int sort); -} diff --git a/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysRoleAuthorityRepository.java b/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysRoleAuthorityRepository.java deleted file mode 100644 index 831b014..0000000 --- a/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysRoleAuthorityRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.xwbing.domain.repository.sys; - -import com.xwbing.domain.entity.sys.SysRoleAuthority; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -/** - * 项目名称: boot-module-demo - * 创建时间: 2017/11/14 15:13 - * 作者: xiangwb - * 说明: - */ -public interface SysRoleAuthorityRepository extends JpaRepository { - List getByRoleId(String roleId); -} diff --git a/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysRoleRepository.java b/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysRoleRepository.java deleted file mode 100644 index 952cf7c..0000000 --- a/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysRoleRepository.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.xwbing.domain.repository.sys; - -import com.xwbing.domain.entity.sys.SysRole; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -/** - * 说明: - * 项目名称: boot-module-demo - * 创建时间: 2017/5/5 16:44 - * 作者: xiangwb - */ -public interface SysRoleRepository extends JpaRepository { - List getByEnable(String enable); - - SysRole getByCode(String code); - - List getByEnableAndIdIn(String enable, List ids); - - List getByIdIn(List ids); -} diff --git a/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserLoginInOutRepository.java b/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserLoginInOutRepository.java deleted file mode 100644 index 8331143..0000000 --- a/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserLoginInOutRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.xwbing.domain.repository.sys; - -import com.xwbing.domain.entity.sys.SysUserLoginInOut; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -/** - * 项目名称: boot-module-demo - * 创建时间: 2017/11/7 9:58 - * 作者: xiangwb - * 说明: - */ -public interface SysUserLoginInOutRepository extends JpaRepository { - List getByInoutType(int inout); -} diff --git a/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserRepository.java b/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserRepository.java deleted file mode 100644 index 39caeb4..0000000 --- a/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.xwbing.domain.repository.sys; - -import com.xwbing.domain.entity.sys.SysUser; -import org.springframework.data.jpa.repository.JpaRepository; -/** - * 说明: - * 项目名称: boot-module-demo - * 创建时间: 2017/5/5 16:44 - * 作者: xiangwb - */ -public interface SysUserRepository extends JpaRepository { - SysUser getByUserName(String name); -} diff --git a/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserRoleRepository.java b/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserRoleRepository.java deleted file mode 100644 index 6d4bc28..0000000 --- a/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserRoleRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.xwbing.domain.repository.sys; - -import com.xwbing.domain.entity.sys.SysUserRole; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -/** - * 项目名称: boot-module-demo - * 创建时间: 2017/11/14 14:13 - * 作者: xiangwb - * 说明: - */ -public interface SysUserRoleRepository extends JpaRepository { - List getByUserId(String userId); -} diff --git a/boot-service/src/main/java/com/xwbing/rabbit/Sender.java b/boot-service/src/main/java/com/xwbing/rabbit/Sender.java index 2f1f22a..9c38a94 100644 --- a/boot-service/src/main/java/com/xwbing/rabbit/Sender.java +++ b/boot-service/src/main/java/com/xwbing/rabbit/Sender.java @@ -24,10 +24,6 @@ public class Sender { private RabbitTemplate rabbitTemplate; private final Logger logger = LoggerFactory.getLogger(Sender.class); - public void sendM(String[] msg) { - send(msg, RabbitConstant.CONTROL_EXCHANGE, "aa"); - } - /** * 发送信息到email队列 * diff --git a/boot-service/src/main/java/com/xwbing/service/rest/CommonService.java b/boot-service/src/main/java/com/xwbing/service/rest/CommonService.java index 0039ba5..aa11586 100644 --- a/boot-service/src/main/java/com/xwbing/service/rest/CommonService.java +++ b/boot-service/src/main/java/com/xwbing/service/rest/CommonService.java @@ -1,12 +1,12 @@ package com.xwbing.service.rest; import com.xwbing.domain.entity.rest.FilesUpload; -import com.xwbing.domain.repository.FilesUploadRepository; +import com.xwbing.domain.mapper.rest.FilesUploadMapper; import com.xwbing.exception.BusinessException; import com.xwbing.util.DigestsUtil; import com.xwbing.util.RestMessage; import org.springframework.stereotype.Service; -import org.springframework.web.multipart.commons.CommonsMultipartFile; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -14,7 +14,6 @@ import javax.servlet.http.HttpSession; import java.io.IOException; import java.io.InputStream; import java.util.Base64; -import java.util.Date; /** * 项目名称: boot-module-demo @@ -25,7 +24,7 @@ import java.util.Date; @Service public class CommonService { @Resource - private FilesUploadRepository uploadRepository; + private FilesUploadMapper uploadMapper; /** * 保存信息表单提交时获取校验签名 @@ -46,7 +45,7 @@ public class CommonService { * @param file * @return */ - public RestMessage upload(CommonsMultipartFile file) { + public RestMessage upload(MultipartFile file) { RestMessage result = new RestMessage(); if (file == null) { throw new BusinessException("请选择文件"); @@ -70,11 +69,9 @@ public class CommonService { //对数据字节进行base64编码 String base64 = Base64.getEncoder().encodeToString(data); filesUpload.setData(base64); - filesUpload.setCreateTime(new Date()); - FilesUpload save = uploadRepository.save(filesUpload); - if (save != null) { + int save = uploadMapper.insert(filesUpload); + if (save == 1) { result.setSuccess(true); - result.setId(save.getId()); result.setMessage("保存文件成功"); } else { result.setMessage("保存文件失败"); diff --git a/boot-service/src/main/java/com/xwbing/service/sys/DataDictionaryService.java b/boot-service/src/main/java/com/xwbing/service/sys/DataDictionaryService.java index f822d51..51ae02e 100644 --- a/boot-service/src/main/java/com/xwbing/service/sys/DataDictionaryService.java +++ b/boot-service/src/main/java/com/xwbing/service/sys/DataDictionaryService.java @@ -2,7 +2,7 @@ package com.xwbing.service.sys; import com.xwbing.constant.CommonConstant; import com.xwbing.domain.entity.sys.DataDictionary; -import com.xwbing.domain.repository.sys.DataDictionaryRepository; +import com.xwbing.domain.repository.DataDictionaryRepository; import com.xwbing.exception.BusinessException; import com.xwbing.util.PassWordUtil; import com.xwbing.util.RestMessage; @@ -32,18 +32,13 @@ public class DataDictionaryService { if (!b) { throw new BusinessException("该编码已存在"); } - //添加必要参数 - String id = PassWordUtil.createId(); - dictionary.setId(id); dictionary.setCreateTime(new Date()); if (StringUtils.isEmpty(dictionary.getParentId())) { dictionary.setParentId(CommonConstant.ROOT); } - //保存 DataDictionary save = dataDictionaryRepository.save(dictionary); if (save != null) { result.setSuccess(true); - result.setId(id); result.setMessage("保存数据字典成功"); } else { result.setMessage("保存数据字典失败"); diff --git a/boot-service/src/main/java/com/xwbing/service/sys/SysAuthorityService.java b/boot-service/src/main/java/com/xwbing/service/sys/SysAuthorityService.java index 0bb49e6..500aa61 100644 --- a/boot-service/src/main/java/com/xwbing/service/sys/SysAuthorityService.java +++ b/boot-service/src/main/java/com/xwbing/service/sys/SysAuthorityService.java @@ -6,6 +6,7 @@ import com.xwbing.domain.entity.sys.SysRoleAuthority; import com.xwbing.domain.entity.vo.SysAuthVo; import com.xwbing.domain.mapper.sys.SysAuthorityMapper; import com.xwbing.exception.BusinessException; +import com.xwbing.util.PassWordUtil; import com.xwbing.util.RestMessage; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -55,9 +56,12 @@ public class SysAuthorityService { if (StringUtils.isEmpty(sysAuthority.getParentId())) { sysAuthority.setParentId(CommonConstant.ROOT); } + String id = PassWordUtil.createId(); + sysAuthority.setId(id); int save = authorityMapper.insert(sysAuthority); if (save == 1) { result.setSuccess(true); + result.setId(id); result.setMessage("保存权限成功"); } else { result.setMessage("保存权限失败"); diff --git a/boot-service/src/main/java/com/xwbing/service/sys/SysConfigService.java b/boot-service/src/main/java/com/xwbing/service/sys/SysConfigService.java index e5c89e3..a24d23f 100644 --- a/boot-service/src/main/java/com/xwbing/service/sys/SysConfigService.java +++ b/boot-service/src/main/java/com/xwbing/service/sys/SysConfigService.java @@ -2,7 +2,7 @@ package com.xwbing.service.sys; import com.xwbing.domain.entity.sys.SysConfig; import com.xwbing.exception.BusinessException; -import com.xwbing.domain.repository.sys.SysConfigRepository; +import com.xwbing.domain.repository.SysConfigRepository; import com.xwbing.util.PassWordUtil; import com.xwbing.util.RestMessage; import org.slf4j.Logger; @@ -32,7 +32,6 @@ public class SysConfigService { * @return */ public RestMessage save(SysConfig sysConfig) { - logger.info("保存配置信息"); RestMessage result = new RestMessage(); if (sysConfig == null) { throw new BusinessException("配置数据不能为空"); @@ -42,7 +41,6 @@ public class SysConfigService { if (old != null) { throw new BusinessException(sysConfig.getCode() + "已存在"); } - sysConfig.setId(PassWordUtil.createId()); sysConfig.setCreateTime(new Date()); SysConfig one = sysConfigRepository.save(sysConfig); if (one != null) { @@ -61,7 +59,6 @@ public class SysConfigService { * @return */ public RestMessage removeByCode(String code) { - logger.info("删除配置信息"); RestMessage result = new RestMessage(); SysConfig old = getByCode(code); if (old == null) { diff --git a/boot-service/src/main/java/com/xwbing/service/sys/SysRoleService.java b/boot-service/src/main/java/com/xwbing/service/sys/SysRoleService.java index cfcb135..1b0b1e5 100644 --- a/boot-service/src/main/java/com/xwbing/service/sys/SysRoleService.java +++ b/boot-service/src/main/java/com/xwbing/service/sys/SysRoleService.java @@ -6,6 +6,7 @@ import com.xwbing.domain.entity.sys.SysRoleAuthority; import com.xwbing.domain.entity.sys.SysUserRole; import com.xwbing.domain.mapper.sys.SysRoleMapper; import com.xwbing.exception.BusinessException; +import com.xwbing.util.PassWordUtil; import com.xwbing.util.RestMessage; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -47,9 +48,12 @@ public class SysRoleService { if (!b) { throw new BusinessException("该编码已存在"); } + String id = PassWordUtil.createId(); + sysRole.setId(id); int save = roleMapper.insert(sysRole); if (save == 1) { result.setSuccess(true); + result.setId(id); result.setMessage("保存角色成功"); } else { result.setMessage("保存角色失败"); diff --git a/boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java b/boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java index 460ef09..c59c78c 100644 --- a/boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java +++ b/boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java @@ -70,6 +70,8 @@ public class SysUserService { sysUser.setPassword(res[2]); // 设置为非管理员 sysUser.setIsAdmin(CommonEnum.YesOrNoEnum.NO.getCode()); + String id = PassWordUtil.createId(); + sysUser.setId(id); int save = userMapper.insert(sysUser); if (save == 0) { throw new BusinessException("新增用户失败"); @@ -77,6 +79,7 @@ public class SysUserService { String[] msg = {sysUser.getMail(), userName, res[0]}; //使用mq发送邮件 sender.sendEmail(msg); + result.setId(id); result.setSuccess(true); return result; } diff --git a/boot-service/src/main/resources/mapper/rest/FilesUpload.xml b/boot-service/src/main/resources/mapper/rest/FilesUpload.xml new file mode 100644 index 0000000..138afed --- /dev/null +++ b/boot-service/src/main/resources/mapper/rest/FilesUpload.xml @@ -0,0 +1,78 @@ + + + + + + + + + + file_upload + + + id, + creator, + modifier, + create_time, + modified_time, + name, + type, + data + + + + + SELECT REPLACE(UUID(), '-', '') + + INSERT INTO + ( + id, + creator, + create_time, + name, + type, + data + ) + VALUES( + #{id}, + #{creator}, + now(), + #{name}, + #{type}, + #{data} + ) + + + + INSERT INTO + ( + id, + creator, + create_time, + name, + type, + data + ) + VALUES + ( + (SELECT REPLACE(UUID(), '-', '') AS id), + #{obj.creator}, + now(), + #{obj.name}, + #{obj.type}, + #{obj.data} + ) + + + + \ No newline at end of file diff --git a/boot-service/src/main/resources/mapper/sys/SysAuthority.xml b/boot-service/src/main/resources/mapper/sys/SysAuthority.xml index 6af6f0b..5a37a0c 100644 --- a/boot-service/src/main/resources/mapper/sys/SysAuthority.xml +++ b/boot-service/src/main/resources/mapper/sys/SysAuthority.xml @@ -51,9 +51,6 @@ - - SELECT REPLACE(UUID(), '-', '') - INSERT INTO ( id, diff --git a/boot-service/src/main/resources/mapper/sys/SysUser.xml b/boot-service/src/main/resources/mapper/sys/SysUser.xml index 65d41db..58bfca5 100644 --- a/boot-service/src/main/resources/mapper/sys/SysUser.xml +++ b/boot-service/src/main/resources/mapper/sys/SysUser.xml @@ -15,8 +15,8 @@ id, creator, modifier, - date_format(create_time,'%Y-%m-%d %h:%i:%s') created, - date_format(modified_time,'%Y-%m-%d %h:%i:%s') modified, + date_format(create_time,'%Y-%m-%d %H:%i:%s') created, + date_format(modified_time,'%Y-%m-%d %H:%i:%s') modified, user_name, name, sex, @@ -31,9 +31,6 @@ - - SELECT REPLACE(UUID(), '-', '') - INSERT INTO ( id, diff --git a/boot-service/src/main/resources/mapper/sys/SysUserLoginInOut.xml b/boot-service/src/main/resources/mapper/sys/SysUserLoginInOut.xml index 6448e02..388cbf8 100644 --- a/boot-service/src/main/resources/mapper/sys/SysUserLoginInOut.xml +++ b/boot-service/src/main/resources/mapper/sys/SysUserLoginInOut.xml @@ -49,7 +49,7 @@ )