diff --git a/README.md b/README.md index 7be1424eebf7a2809dc5e4128b7514d2cad55ce8..e5f50eb5811f09a529b89954538970d93aea4508 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,10 @@ oauthserver是一个基于Spring Boot Oauth2的完整的独立的Oauth2 Server 4. 日志管理 ## 更新日志 +### 2.0.20190802-alpha +1. 代码生成器支持sql server； +2. service通用实现，减少大量冗余serviceImpl代码。 + ### 2.0.20190708-alpha 1. 代码生成器多语言bug修复； 2. postgresql环境下的sql bug修复； diff --git a/api/src/main/java/com/simon/common/config/OAuthSecurityConfig.java b/api/src/main/java/com/simon/common/config/OAuthSecurityConfig.java index 129b815b1429ca4638bccf16dd01b2c1210dcfd9..a220140f9345c7fe1eb50ff76e80a763379c1fd6 100644 --- a/api/src/main/java/com/simon/common/config/OAuthSecurityConfig.java +++ b/api/src/main/java/com/simon/common/config/OAuthSecurityConfig.java @@ -24,7 +24,8 @@ import javax.annotation.PostConstruct; import javax.sql.DataSource; /** - * Created by simon on 2017/2/18. + * @author simon + * @date 2017/2/18 */ @Configuration @EnableAuthorizationServer @@ -56,12 +57,15 @@ public class OAuthSecurityConfig extends AuthorizationServerConfigurerAdapter { clients.inMemory() .withClient("clientIdPassword") .redirectUris("http://www.baidu.com") - .secret("$2a$11$uBcjOC6qWFpxkQJtPyMhPOweH.8gP3Ig1mt27mGDpBncR7gErOuF6") //明文secret + //明文secret + .secret("$2a$11$uBcjOC6qWFpxkQJtPyMhPOweH.8gP3Ig1mt27mGDpBncR7gErOuF6") .scopes("read,write,trust") .authorizedGrantTypes("authorization_code", "refresh_token", "password", "client_credentials") .authorities("ROLE_ADMIN", "ROLE_USER") - .accessTokenValiditySeconds(7200)//access_token有效期为2小时 - .refreshTokenValiditySeconds(5184000)//refresh_token有效期为2个月60天 + //access_token有效期为2小时 + .accessTokenValiditySeconds(7200) + //refresh_token有效期为2个月60天 + .refreshTokenValiditySeconds(5184000) .autoApprove(false); //clients.jdbc(dataSource); } @@ -84,11 +88,11 @@ public class OAuthSecurityConfig extends AuthorizationServerConfigurerAdapter { .checkTokenAccess("isAuthenticated()") //client password加密即oauth_client_details表的client_secret字段 .passwordEncoder(passwordEncoder()) - .addTokenEndpointAuthenticationFilter(integrationAuthenticationFilter); + .addTokenEndpointAuthenticationFilter(integrationAuthenticationFilter); } @Bean - public PasswordEncoder passwordEncoder(){ + public PasswordEncoder passwordEncoder() { return new BCryptPasswordEncoder(11); } @@ -102,7 +106,7 @@ public class OAuthSecurityConfig extends AuthorizationServerConfigurerAdapter { private AuthorizationEndpoint authorizationEndpoint; @PostConstruct - public void init(){ + public void init() { authorizationEndpoint.setUserApprovalPage("forward:/oauth/my_approval_page"); authorizationEndpoint.setErrorPage("forward:/oauth/my_error_page"); } diff --git a/api/src/main/java/com/simon/common/plugins/jwt/CustomTokenEnhancer.java b/api/src/main/java/com/simon/common/plugins/jwt/CustomTokenEnhancer.java index d82418fc37249850b05b0eefc1a04435473f975f..1b36e78da3b77fe54b8c46ba4c2590e0edbe3c37 100644 --- a/api/src/main/java/com/simon/common/plugins/jwt/CustomTokenEnhancer.java +++ b/api/src/main/java/com/simon/common/plugins/jwt/CustomTokenEnhancer.java @@ -1,11 +1,13 @@ package com.simon.common.plugins.jwt; +import com.alibaba.fastjson.JSON; +import lombok.extern.slf4j.Slf4j; import org.springframework.security.oauth2.common.DefaultOAuth2AccessToken; import org.springframework.security.oauth2.common.OAuth2AccessToken; import org.springframework.security.oauth2.provider.OAuth2Authentication; import org.springframework.security.oauth2.provider.token.TokenEnhancer; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; /** @@ -14,13 +16,17 @@ import java.util.Map; * @author simon * @date 2018-12-05 **/ - +@Slf4j public class CustomTokenEnhancer implements TokenEnhancer { @Override public OAuth2AccessToken enhance(OAuth2AccessToken oAuth2AccessToken, OAuth2Authentication oAuth2Authentication) { - Map additionalInfo = new HashMap<>(); - additionalInfo.put("test", oAuth2Authentication.getName()); - ((DefaultOAuth2AccessToken)oAuth2AccessToken).setAdditionalInformation(additionalInfo); + if (oAuth2AccessToken instanceof DefaultOAuth2AccessToken){ + DefaultOAuth2AccessToken token= (DefaultOAuth2AccessToken) oAuth2AccessToken; + Map additionalInformation = new LinkedHashMap(); + additionalInformation.put("username",oAuth2Authentication.getName()); + token.setAdditionalInformation(additionalInformation); + } + log.info(JSON.toJSONString(oAuth2AccessToken)); return oAuth2AccessToken; } } diff --git a/api/src/main/resources/templates/code/entity.ftl b/api/src/main/resources/templates/code/entity.ftl index 3e3207b06a650fd0127ab08d8d0fd9d785117829..e8bdbd1193e6be76ccae7c0336549445803acc8f 100644 --- a/api/src/main/resources/templates/code/entity.ftl +++ b/api/src/main/resources/templates/code/entity.ftl @@ -1,5 +1,6 @@ package ${basePackage}.model; +import com.simon.common.domain.BasePo; import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.ToStringSerializer; import com.fasterxml.jackson.annotation.JsonFormat; @@ -34,10 +35,10 @@ import java.time.LocalDateTime; @ExcelTable(sheetName = "${tableComment}", workbookType = WorkbookType.SXLSX, rowAccessWindowSize = 100, useFieldNameAsTitle = true) @ApiModel(description = "${tableComment}") @Data -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode(callSuper = true) @Entity @Table(name="${tableName}") -public class ${entityName} implements Serializable { +public class ${entityName} extends BasePo<${idType}> implements Serializable { @ExcludeColumn private static final long serialVersionUID = 1L; <#list columns as column> diff --git a/api/src/main/resources/templates/code/mapper.ftl b/api/src/main/resources/templates/code/mapper.ftl index 77f3ef2062af8d7b9bc34db1589b1f94e17db08d..e158ee20328aa946b67dd0e579bfabf3376d8725 100644 --- a/api/src/main/resources/templates/code/mapper.ftl +++ b/api/src/main/resources/templates/code/mapper.ftl @@ -1,6 +1,6 @@ package ${basePackage}.mapper; -import ${basePackage}.common.mapper.MyMapper; +import ${basePackage}.common.mapper.CrudMapper; import ${basePackage}.model.${modelNameUpperCamel}; import ${basePackage}.provider.${modelNameUpperCamel}Provider; import org.apache.ibatis.annotations.Mapper; @@ -20,7 +20,7 @@ import java.time.LocalDateTime; * @date ${CREATE} **/ @Mapper -public interface ${modelNameUpperCamel}Mapper extends MyMapper<${modelNameUpperCamel}> { +public interface ${modelNameUpperCamel}Mapper extends CrudMapper<${modelNameUpperCamel}> { /** * 使用Map查询 * @param map 查询条件 diff --git a/api/src/main/resources/templates/code/service-impl.ftl b/api/src/main/resources/templates/code/service-impl.ftl index 2f7e6be1df2c8b43eeff0de9df6e12fae007a594..30188935cef05501f1bb07c4c73ef7f9e929517e 100644 --- a/api/src/main/resources/templates/code/service-impl.ftl +++ b/api/src/main/resources/templates/code/service-impl.ftl @@ -1,6 +1,7 @@ package ${basePackage}.service.impl; +import com.simon.common.service.impl.CrudServiceImpl; import ${basePackage}.mapper.${modelNameUpperCamel}Mapper; import ${basePackage}.model.${modelNameUpperCamel}; import ${basePackage}.service.${modelNameUpperCamel}Service; @@ -34,128 +35,6 @@ import java.time.LocalDateTime; @Slf4j @Service @Transactional(rollbackFor = {Exception.class}) -public class ${modelNameUpperCamel}ServiceImpl implements ${modelNameUpperCamel}Service { - @Autowired - private SqlSessionFactory sqlSessionFactory; +public class ${modelNameUpperCamel}ServiceImpl extends CrudServiceImpl<${modelNameUpperCamel}, ${idType}> implements ${modelNameUpperCamel}Service { - @Autowired - private ${modelNameUpperCamel}Mapper ${modelNameLowerCamel}Mapper; - - @Autowired - private ${modelNameUpperCamel}Repository ${modelNameLowerCamel}Repository; - - @Override - public long count() { - return ${modelNameLowerCamel}Repository.count(); - } - - @Override - public ${modelNameUpperCamel} save(${modelNameUpperCamel} ${modelNameLowerCamel}){ - return ${modelNameLowerCamel}Repository.save(${modelNameLowerCamel}); - } - - @Override - public List<${modelNameUpperCamel}> save(List<${modelNameUpperCamel}> ${modelNameLowerCamel}List) { - return ${modelNameLowerCamel}Repository.save(${modelNameLowerCamel}List); - } - - @Override - public PageInfo<${modelNameUpperCamel}> findAll(Integer pageNo, Integer pageSize, String orderBy){ - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List<${modelNameUpperCamel}> list = ${modelNameLowerCamel}Mapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page<${modelNameUpperCamel}> findAll(Pageable pageable){ - return ${modelNameLowerCamel}Repository.findAll(pageable); - } - - @Override - public List<${modelNameUpperCamel}> findAll(){ - return ${modelNameLowerCamel}Repository.findAll(); - } - - @Override - public void delete(${idType} id){ - ${modelNameLowerCamel}Repository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return ${modelNameLowerCamel}Mapper.deleteByIds(ids); - } - - @Override - public ${modelNameUpperCamel} findById(${idType} id){ - return ${modelNameLowerCamel}Repository.findOne(id); - } - - @Override - public int insertList(List<${modelNameUpperCamel}> list){ - return ${modelNameLowerCamel}Mapper.insertList(list); - } - - @Override - public int insert(${modelNameUpperCamel} ${modelNameLowerCamel}){ - return ${modelNameLowerCamel}Mapper.insert(${modelNameLowerCamel}); - } - - @Override - public int insertSelective(${modelNameUpperCamel} ${modelNameLowerCamel}){ - return ${modelNameLowerCamel}Mapper.insertSelective(${modelNameLowerCamel}); - } - - @Override - public int updateByPrimaryKey(${modelNameUpperCamel} ${modelNameLowerCamel}){ - return ${modelNameLowerCamel}Mapper.updateByPrimaryKey(${modelNameLowerCamel}); - } - - @Override - public int updateByPrimaryKeySelective(${modelNameUpperCamel} ${modelNameLowerCamel}){ - return ${modelNameLowerCamel}Mapper.updateByPrimaryKeySelective(${modelNameLowerCamel}); - } - - @Override - public PageInfo<${modelNameUpperCamel}> getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List<${modelNameUpperCamel}> list = ${modelNameLowerCamel}Mapper.getList(params); - return new PageInfo<>(list); - } - - @Override - public void batchSave(List<${modelNameUpperCamel}> list) { - SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH); - ${modelNameUpperCamel}Mapper mapper = sqlSession.getMapper(${modelNameUpperCamel}Mapper.class); - for (${modelNameUpperCamel} item : list) { - mapper.insert(item); - } - sqlSession.commit(); - } - - @Override - public void batchUpdate(List<${modelNameUpperCamel}> list) { - SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH); - ${modelNameUpperCamel}Mapper mapper = sqlSession.getMapper(${modelNameUpperCamel}Mapper.class); - for (${modelNameUpperCamel} item : list) { - mapper.updateByPrimaryKeySelective(item); - } - sqlSession.commit(); - } } \ No newline at end of file diff --git a/api/src/main/resources/templates/code/service.ftl b/api/src/main/resources/templates/code/service.ftl index db45944dd6fe2238bd4650b505cfa9f55db5bb5a..fea80fd362e2a78e9ff0022a4adfa0d2ef3faa4e 100644 --- a/api/src/main/resources/templates/code/service.ftl +++ b/api/src/main/resources/templates/code/service.ftl @@ -1,6 +1,6 @@ package ${basePackage}.service; import ${basePackage}.model.${modelNameUpperCamel}; -import ${basePackage}.common.service.BasicService; +import ${basePackage}.common.service.CrudService; import java.time.LocalTime; import java.time.LocalDate; @@ -10,6 +10,6 @@ import java.time.LocalDateTime; * @author ${AUTHOR} * @date ${CREATE} **/ -public interface ${modelNameUpperCamel}Service extends BasicService<${modelNameUpperCamel}, ${idType}> { +public interface ${modelNameUpperCamel}Service extends CrudService<${modelNameUpperCamel}, ${idType}> { } \ No newline at end of file diff --git a/common/pom.xml b/common/pom.xml index 60d6fa4c1ff19fe7df25ad58516cb62a139a6950..dd28133d14d2a1ebd7f9b77020441a24923d6925 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -89,6 +89,16 @@ ojdbc14 runtime + + com.microsoft.sqlserver + mssql-jdbc + runtime + + + com.microsoft.sqlserver + sqljdbc4 + runtime + org.projectlombok diff --git a/common/src/main/java/com/simon/common/code/DbType.java b/common/src/main/java/com/simon/common/code/DbType.java index e4b4c5aede9d3e3686f41fa6837161ab278116b1..7541b90a3510192227486dc4573407b80d5f7627 100644 --- a/common/src/main/java/com/simon/common/code/DbType.java +++ b/common/src/main/java/com/simon/common/code/DbType.java @@ -11,4 +11,5 @@ public class DbType { public static final int MYSQL = 1; public static final int POSTGRESQL = 2; public static final int ORACLE = 3; + public static final int SQL_SERVER = 4; } diff --git a/common/src/main/java/com/simon/common/code/TypeTranslator.java b/common/src/main/java/com/simon/common/code/TypeTranslator.java index ef3f42d87cb56bce69f8add86e61cb91259bedb6..76d9136f22260de5107505b2839743463fde63e3 100644 --- a/common/src/main/java/com/simon/common/code/TypeTranslator.java +++ b/common/src/main/java/com/simon/common/code/TypeTranslator.java @@ -52,11 +52,18 @@ public class TypeTranslator { private static String CLOB = "CLOB"; + private static String NCHAR = "NCHAR"; + private static String NVARCHAR = "NVARCHAR"; + private static String DATETIME2 = "DATETIME2"; + private static String SMALLDATETIME = "SMALLDATETIME"; + private static String DATETIMEOFFSET = "DATETIMEOFFSET"; + private static String NTEXT = "NTEXT"; + /** * 参考https://documentation.progress.com/output/DataDirect/DataDirectCloud/index.html#page/queries%2Fmysql-data-types.html%23 * - * @param columnType 列类型 - * @param dataType 数据类型 + * @param columnType 列类型，例如varchar(25) + * @param dataType 数据类型，例如varchar * @return java数据类型 */ public static String translateMySQL(String columnType, String dataType) { @@ -128,8 +135,8 @@ public class TypeTranslator { /** * 参考https://documentation.progress.com/output/DataDirect/DataDirectCloud/index.html#page/queries/postgresql-data-types.html * - * @param columnType 列类型 - * @param dataType 数据类型 + * @param columnType 列类型，例如varchar(25) + * @param dataType 数据类型，例如varchar * @return java数据类型 */ public static String translatePostgreSQL(String columnType, String dataType) { @@ -180,7 +187,7 @@ public class TypeTranslator { * Oracle数据类型转java类型 * * @param columnType DATA_LENGTH - * @param dataType DATA_TYPE + * @param dataType 数据类型，例如varchar * @param dataScale 小数点后有几位 * @return */ @@ -234,4 +241,56 @@ public class TypeTranslator { } return "Object"; } + + /** + * SQL Server + * @param columnType DATA_LENGTH，如果是小数，指整数位数 + * @param dataType 数据类型，例如varchar + * @param dataScale 小数点后有几位 + * @return java数据类型 + */ + public static String translateSqlServer(String columnType, String dataType, String dataScale) { + Integer dataLength = Integer.parseInt(columnType); + int dataScaleValue = -1; + if (StringUtils.isNotEmpty(dataScale) && StringUtils.isNumeric(dataScale)) { + dataScaleValue = Integer.parseInt(dataScale); + } + dataType = dataType.toUpperCase(); + if (CHAR.equals(dataType) || VARCHAR.equals(dataType) || NCHAR.equals(dataType) || NVARCHAR.equals(dataType) || TEXT.equals(dataType) || NTEXT.equals(dataType)) { + return "String"; + } + if (NUMERIC.equals(dataType) || DECIMAL.equals(dataType)) { + if (dataScaleValue <= 0) { + if (dataLength <= 10) { + return "Integer"; + } else { + return "Long"; + } + } else { + return "BigDecimal"; + } + } + if (INT.equals(dataType) || SMALLINT.equals(dataType)) { + return "Integer"; + } + if (BIGINT.equals(dataType)) { + return "Long"; + } + if (FLOAT.equals(dataType) || REAL.equals(dataType)) { + return "Float"; + } + if (DATETIME.equals(dataType) || DATETIME2.equals(dataType) || SMALLDATETIME.equals(dataType) || DATETIMEOFFSET.equals(dataType)) { + return "LocalDateTime"; + } + if (DATE.equals(dataType)) { + return "LocalDate"; + } + if (TIME.equals(dataType)) { + return "LocalTime"; + } + if (BIT.equals(dataType)) { + return "Boolean"; + } + return "Object"; + } } diff --git a/common/src/main/java/com/simon/common/domain/BasePo.java b/common/src/main/java/com/simon/common/domain/BasePo.java new file mode 100644 index 0000000000000000000000000000000000000000..080288cb667d5c070404d2ed748affa983e3c0b9 --- /dev/null +++ b/common/src/main/java/com/simon/common/domain/BasePo.java @@ -0,0 +1,40 @@ +package com.simon.common.domain; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @author simon + * @version 1.0 + * @date 2019-07-27 15:48 + */ +@Data +@EqualsAndHashCode(callSuper = false) +public abstract class BasePo implements PO { +/* + @ExcludeColumn + @JSONField(serializeUsing = ToStringSerializer.class) + @ApiModelProperty(value = "创建人id") + @Column(name = "create_by") + private Long createBy; + + @ExcludeColumn + @JSONField(format = AppConfig.DATE_PATTERN_DATETIME) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) + @ApiModelProperty(value = "创建时间") + @Column(name = "create_date") + private LocalDateTime createDate; + + @ExcludeColumn + @JSONField(serializeUsing = ToStringSerializer.class) + @ApiModelProperty(value = "更新人id") + @Column(name = "update_by") + private Long updateBy; + + @ExcludeColumn + @JSONField(format = AppConfig.DATE_PATTERN_DATETIME) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) + @ApiModelProperty(value = "更新时间") + @Column(name = "update_date") + private LocalDateTime updateDate;*/ +} diff --git a/common/src/main/java/com/simon/common/domain/PO.java b/common/src/main/java/com/simon/common/domain/PO.java new file mode 100644 index 0000000000000000000000000000000000000000..90cfa5024396847949d2ededaf2cac16542e719b --- /dev/null +++ b/common/src/main/java/com/simon/common/domain/PO.java @@ -0,0 +1,28 @@ +package com.simon.common.domain; + +/** + * @author simon + * @version 1.0 + * @date 2019-07-27 14:49 + */ +public interface PO { + /*ID getId(); + + void setId(ID id); + + LocalDateTime getCreateDate(); + + void setCreateDate(LocalDateTime createDate); + + LocalDateTime getUpdateDate(); + + void setUpdateDate(LocalDateTime updateDate); + + Long getCreateBy(); + + void setCreateBy(Long createBy); + + Long getUpdateBy(); + + void setUpdateBy(Long updateBy);*/ +} diff --git a/common/src/main/java/com/simon/common/mapper/MyMapper.java b/common/src/main/java/com/simon/common/mapper/CrudMapper.java similarity index 60% rename from common/src/main/java/com/simon/common/mapper/MyMapper.java rename to common/src/main/java/com/simon/common/mapper/CrudMapper.java index 0b2642de5a649a6f2b81976ea6e55064c4a393b9..7ac64235fd25b070f75110efc31ea6f40adfe2a3 100644 --- a/common/src/main/java/com/simon/common/mapper/MyMapper.java +++ b/common/src/main/java/com/simon/common/mapper/CrudMapper.java @@ -5,6 +5,9 @@ import tk.mybatis.mapper.common.ConditionMapper; import tk.mybatis.mapper.common.IdsMapper; import tk.mybatis.mapper.common.special.InsertListMapper; +import java.util.List; +import java.util.Map; + /** * 通用mapper * @@ -12,5 +15,6 @@ import tk.mybatis.mapper.common.special.InsertListMapper; * @create 2018-07-23 0:37 **/ -public interface MyMapper extends BaseMapper,ConditionMapper,IdsMapper,InsertListMapper { +public interface CrudMapper extends BaseMapper,ConditionMapper,IdsMapper,InsertListMapper { + List getList(Map map); } diff --git a/common/src/main/java/com/simon/common/service/CrudService.java b/common/src/main/java/com/simon/common/service/CrudService.java new file mode 100644 index 0000000000000000000000000000000000000000..59fce129f58d83285ad5616dc9842eff228380df --- /dev/null +++ b/common/src/main/java/com/simon/common/service/CrudService.java @@ -0,0 +1,30 @@ +package com.simon.common.service; + +import java.util.List; + +/** + * Basic Service + * + * @author simon + * @date 2018-08-02 + **/ + +public interface CrudService extends InsertService, UpdateService, DeleteService, SelectService { + + /** + * 新建或更新记录 + * @param model 记录 + * @return 批量新建或更新后的记录 + */ + @Deprecated + T save(T model); + + /** + * 批量新建或更新记录 + * @param modelList 记录列表 + * @return 批量新建或更新后的记录列表 + */ + @Deprecated + List save(List modelList); + +} \ No newline at end of file diff --git a/common/src/main/java/com/simon/common/service/DeleteService.java b/common/src/main/java/com/simon/common/service/DeleteService.java new file mode 100644 index 0000000000000000000000000000000000000000..a62914fa1a4bfc97689e18f1e93f5313f30c994b --- /dev/null +++ b/common/src/main/java/com/simon/common/service/DeleteService.java @@ -0,0 +1,23 @@ +package com.simon.common.service; + +/** + * @author simon + * @version 1.0 + * @date 2019-07-26 15:46 + */ +public interface DeleteService { + + /** + * 根据id删除记录 + * @param id 记录id + */ + void delete(ID id); + + /** + * 根据id批量删除记录 + * @param ids 批量记录id，逗号隔开 + * @return 影响的记录条数 + */ + int deleteByIds(String ids); + +} diff --git a/common/src/main/java/com/simon/common/service/InsertService.java b/common/src/main/java/com/simon/common/service/InsertService.java new file mode 100644 index 0000000000000000000000000000000000000000..21e1ba4551a0b9c612a180f2f2bf174025659441 --- /dev/null +++ b/common/src/main/java/com/simon/common/service/InsertService.java @@ -0,0 +1,38 @@ +package com.simon.common.service; + +import java.util.List; + +/** + * @author simon + * @version 1.0 + * @date 2019-07-26 15:45 + */ +public interface InsertService { + + /** + * 批量插入记录 + * @param list 记录列表 + * @return 影响的记录条数 + */ + int insertList(List list); + + /** + * 插入记录 + * @param model 记录 + * @return 影响的记录条数 + */ + int insert(T model); + + /** + * 可选地插入记录（只保存记录的非空属性） + * @param model 记录 + * @return 影响的记录条数 + */ + int insertSelective(T model); + + /** + * 批量保存 + * @param list 要保存的数据 + */ + void batchSave(List list); +} diff --git a/common/src/main/java/com/simon/common/service/BasicService.java b/common/src/main/java/com/simon/common/service/SelectService.java similarity index 42% rename from common/src/main/java/com/simon/common/service/BasicService.java rename to common/src/main/java/com/simon/common/service/SelectService.java index 767d081aa023b7a2b3c295bf3c55a527dc5bba86..3e03dcade8aa6b396113d4d25baa692df9427b9c 100644 --- a/common/src/main/java/com/simon/common/service/BasicService.java +++ b/common/src/main/java/com/simon/common/service/SelectService.java @@ -8,34 +8,17 @@ import java.util.List; import java.util.Map; /** - * Basic Service - * * @author simon - * @date 2018-08-02 - **/ - -public interface BasicService { + * @version 1.0 + * @date 2019-07-26 15:46 + */ +public interface SelectService { /** * 统计记录总条数 * @return 记录总条数 */ long count(); - /** - * 保存记录 - * @param model 记录 - * @return 保存后的记录 - */ - T save(T model); - - /** - * 批量保存记录 - * @param modelList 记录列表 - * @return 保存后的记录列表 - */ - @Deprecated - List save(List modelList); - /** * PageHelper分页查询 * @param pageNo 页码 @@ -58,19 +41,6 @@ public interface BasicService { */ List findAll(); - /** - * 根据id删除记录 - * @param id 记录id - */ - void delete(ID id); - - /** - * 根据id批量删除记录 - * @param ids 批量记录id，逗号隔开 - * @return 影响的记录条数 - */ - int deleteByIds(String ids); - /** * 根据id查询记录 * @param id 记录id @@ -78,41 +48,6 @@ public interface BasicService { */ T findById(ID id); - /** - * 批量插入记录 - * @param list 记录列表 - * @return 影响的记录条数 - */ - int insertList(List list); - - /** - * 插入记录 - * @param model 记录 - * @return 影响的记录条数 - */ - int insert(T model); - - /** - * 可选地插入记录（只保存记录的非空属性） - * @param model 记录 - * @return 影响的记录条数 - */ - int insertSelective(T model); - - /** - * 根据id更新记录（更新记录的全部属性） - * @param model 待更新记录 - * @return 影响的记录条数 - */ - int updateByPrimaryKey(T model); - - /** - * 根据id更新记录（只更新记录的非空属性） - * @param model 待更新记录 - * @return 影响的记录条数 - */ - int updateByPrimaryKeySelective(T model); - /** * 通用查询 * @param params 参数 @@ -121,18 +56,7 @@ public interface BasicService { * @param orderBy 排序 * @return 分页数据 */ + @Deprecated PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy); - - /** - * 批量保存 - * @param list 要保存的数据 - */ - void batchSave(List list); - - /** - * 批量更新 - * @param list 要更新的数据 - */ - void batchUpdate(List list); -} \ No newline at end of file +} diff --git a/common/src/main/java/com/simon/common/service/UpdateService.java b/common/src/main/java/com/simon/common/service/UpdateService.java new file mode 100644 index 0000000000000000000000000000000000000000..80d78de7ab3731d24c2ccfb65aa30fab6e0ae45e --- /dev/null +++ b/common/src/main/java/com/simon/common/service/UpdateService.java @@ -0,0 +1,30 @@ +package com.simon.common.service; + +import java.util.List; + +/** + * @author simon + * @version 1.0 + * @date 2019-07-26 15:45 + */ +public interface UpdateService { + /** + * 根据id更新记录（更新记录的全部属性） + * @param model 待更新记录 + * @return 影响的记录条数 + */ + int updateByPrimaryKey(T model); + + /** + * 根据id更新记录（只更新记录的非空属性） + * @param model 待更新记录 + * @return 影响的记录条数 + */ + int updateByPrimaryKeySelective(T model); + + /** + * 批量更新 + * @param list 要更新的数据 + */ + void batchUpdate(List list); +} diff --git a/common/src/main/java/com/simon/common/service/impl/CrudServiceImpl.java b/common/src/main/java/com/simon/common/service/impl/CrudServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..39f5bdb9ae0c38fb095435846bd736014fe2d740 --- /dev/null +++ b/common/src/main/java/com/simon/common/service/impl/CrudServiceImpl.java @@ -0,0 +1,150 @@ +package com.simon.common.service.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simon.common.config.AppConfig; +import com.simon.common.domain.PO; +import com.simon.common.mapper.CrudMapper; +import com.simon.common.service.CrudService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.session.SqlSessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.lang.reflect.ParameterizedType; +import java.util.List; +import java.util.Map; + +/** + * @author simon + * @version 1.0 + * @date 2019-07-27 14:48 + */ +@Slf4j +public abstract class CrudServiceImpl, ID extends java.io.Serializable> implements CrudService { + @Autowired + private SqlSessionFactory sqlSessionFactory; + + @Autowired + protected CrudMapper crudMapper; + + @Autowired + protected JpaRepository jpaRepository; + + protected Class poType; + + @SuppressWarnings("unchecked") + public CrudServiceImpl() { + ParameterizedType pt = (ParameterizedType) this.getClass().getGenericSuperclass(); + poType = (Class) pt.getActualTypeArguments()[0]; + } + + @Override + public long count() { + return jpaRepository.count(); + } + + @Override + public T save(T model) { + return jpaRepository.save(model); + } + + @Override + public List save(List list) { + return jpaRepository.save(list); + } + + @Override + public List findAll() { + return jpaRepository.findAll(); + } + + @Override + public Page findAll(Pageable pageable) { + return jpaRepository.findAll(pageable); + } + + @Override + public void delete(ID id) { + jpaRepository.delete(id); + } + + @Override + public int deleteByIds(String ids) { + return crudMapper.deleteByIds(ids); + } + + @Override + public T findById(ID id) { + return jpaRepository.findOne(id); + } + + @Override + public int insert(T model) { + return crudMapper.insert(model); + } + + @Override + public int insertSelective(T model) { + return crudMapper.insertSelective(model); + } + + @Override + public int insertList(List list) { + return crudMapper.insertList(list); + } + + @Override + public int updateByPrimaryKey(T model) { + return crudMapper.updateByPrimaryKey(model); + } + + @Override + public int updateByPrimaryKeySelective(T model) { + return crudMapper.updateByPrimaryKeySelective(model); + } + + @Override + public void batchSave(List list) { + + } + + @Override + public void batchUpdate(List list) { + + } + + @Override + public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy) { + if (null == pageSize) { + pageSize = AppConfig.DEFAULT_PAGE_SIZE; + } + orderBy = orderBy.trim(); + if (StringUtils.isEmpty(orderBy)) { + PageHelper.startPage(pageNo, pageSize); + } else { + PageHelper.startPage(pageNo, pageSize, orderBy); + } + List list = crudMapper.selectAll(); + return new PageInfo<>(list); + } + + @Override + public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { + if (null == pageSize) { + pageSize = AppConfig.DEFAULT_PAGE_SIZE; + } + orderBy = orderBy.trim(); + if (StringUtils.isEmpty(orderBy)) { + PageHelper.startPage(pageNo, pageSize); + } else { + PageHelper.startPage(pageNo, pageSize, orderBy); + } + List list = crudMapper.getList(params); + return new PageInfo<>(list); + } + +} diff --git a/common/src/main/java/com/simon/common/utils/DbUtil.java b/common/src/main/java/com/simon/common/utils/DbUtil.java index 0a57335b57b781d1d50bf95279973fdb97dfc758..7859e055b7dd985d5fe7eca292542198c89b5920 100644 --- a/common/src/main/java/com/simon/common/utils/DbUtil.java +++ b/common/src/main/java/com/simon/common/utils/DbUtil.java @@ -67,6 +67,8 @@ public class DbUtil { sql = "SELECT COUNT(*) FROM pg_class C"; } else if (dbType == DbType.ORACLE) { sql = "select COUNT(*) from all_tab_comments"; + } else if (dbType == DbType.SQL_SERVER) { + sql = "SELECT COUNT(*) FROM sys.tables"; } else { throw new Exception("暂不支持其他数据库"); } @@ -139,6 +141,14 @@ public class DbUtil { if (StringUtils.isNotEmpty(tableCommentKey)) { sql += " AND COMMENTS LIKE '%" + tableCommentKey + "%'"; } + } else if (dbType == DbType.SQL_SERVER) { + sql = "SELECT a.name AS TABLE_NAME, CONVERT ( NVARCHAR ( 100 ), isnull( g.[value], '' )) AS TABLE_COMMENT FROM sys.tables a LEFT JOIN sys.extended_properties g ON ( a.object_id = g.major_id AND g.minor_id = 0 ) WHERE 1=1"; + if (StringUtils.isNotEmpty(tableNameKey)) { + sql += " AND a.name LIKE '%" + tableNameKey + "%'"; + } + if (StringUtils.isNotEmpty(tableCommentKey)) { + sql += " AND COMMENTS LIKE '%" + tableCommentKey + "%'"; + } } else { throw new Exception("暂不支持其他数据库"); } @@ -202,6 +212,11 @@ public class DbUtil { if (StringUtils.isNotEmpty(tableName)) { sql += " AND TABLE_NAME=UPPER('" + tableName + "')"; } + } else if (dbType == DbType.SQL_SERVER) { + sql = "SELECT a.name AS TABLE_NAME, CONVERT ( NVARCHAR ( 100 ), isnull( g.[value], '' )) AS TABLE_COMMENT FROM sys.tables a LEFT JOIN sys.extended_properties g ON ( a.object_id = g.major_id AND g.minor_id = 0 ) "; + if (StringUtils.isNotEmpty(tableName)) { + sql += " AND a.name='" + tableName + "'"; + } } else { throw new Exception("暂不支持其他数据库"); } @@ -246,6 +261,8 @@ public class DbUtil { return 2; } else if (driverName.contains("oracle")) { return 3; + } else if (driverName.contains("sql server")) { + return 4; } return -1; } @@ -332,6 +349,32 @@ public class DbUtil { "FULL JOIN ( SELECT column_name, COMMENTS FROM all_col_comments WHERE Table_Name = '" + tableName.toUpperCase() + "' ) acc ON atc.column_name = acc.column_name \n" + "WHERE\n" + "atc.table_name = '" + tableName.toUpperCase() + "'"; + } else if (dbType == DbType.SQL_SERVER) { + sql = "SELECT\n" + + "\t* \n" + + "FROM\n" + + "\t(\n" + + "\tSELECT\n" + + "\t\td.name AS TABLE_NAME,\n" + + "\t\ta.name AS COLUMN_NAME,\n" + + "\t\tisnull( g.[value], '' ) AS COLUMN_COMMENT,\n" + + "\t\tb.name AS DATA_TYPE,\n" + + "\t\tCOLUMNPROPERTY( a.id, a.name, 'PRECISION' ) AS COLUMN_TYPE,\n" + + "\t\tCOLUMNPROPERTY( a.id, a.name, 'PRECISION' ) AS DATA_LENGTH,\n" + + "\t\tisnull( COLUMNPROPERTY( a.id, a.name, 'Scale' ), 0 ) AS DATA_SCALE,\n" + + "\t\ta.isnullable AS IS_NULLABLE \n" + + "\tFROM\n" + + "\t\tsyscolumns a\n" + + "\t\tLEFT JOIN systypes b ON a.xtype= b.xusertype\n" + + "\t\tINNER JOIN sysobjects d ON a.id= d.id \n" + + "\t\tAND d.xtype= 'U' \n" + + "\t\tAND d.name<> 'dtproperties'\n" + + "\t\tLEFT JOIN syscomments e ON a.cdefault= e.id\n" + + "\t\tLEFT JOIN sys.extended_properties g ON a.id= g.major_id \n" + + "\t\tAND a.colid = g.minor_id \n" + + "\t) t \n" + + "WHERE\n" + + "\tTABLE_NAME LIKE '%" + tableName + "%'"; } else { throw new Exception("暂不支持其他数据库"); } @@ -349,9 +392,14 @@ public class DbUtil { String comment = rs.getString("column_comment"); String isNullable = rs.getString("is_nullable"); String dataScale = ""; + String dataLength = ""; if (dbType == DbType.ORACLE) { dataScale = rs.getString("data_scale"); } + if (dbType == DbType.SQL_SERVER) { + dataScale = rs.getString("data_scale"); + dataLength = rs.getString("data_length"); + } if (StringUtils.isEmpty(comment)) { comment = name; @@ -364,6 +412,8 @@ public class DbUtil { propertyType = TypeTranslator.translatePostgreSQL(columnType, dataType); } else if (dbType == DbType.ORACLE) { propertyType = TypeTranslator.translateOracle(columnType, dataType, dataScale); + } else if (dbType == DbType.SQL_SERVER) { + propertyType = TypeTranslator.translateSqlServer(dataLength, dataType, dataScale); } else { throw new Exception("暂不支持其他数据库"); } diff --git a/common/src/main/java/com/simon/mapper/AccountBindMapper.java b/common/src/main/java/com/simon/mapper/AccountBindMapper.java index 02a9da616662e0677ee70b53fba858d280b34afe..3d96c2bba9018c6a6dc1fdb5091040bfc60b039e 100644 --- a/common/src/main/java/com/simon/mapper/AccountBindMapper.java +++ b/common/src/main/java/com/simon/mapper/AccountBindMapper.java @@ -1,12 +1,12 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.model.AccountBind; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; -public interface AccountBindMapper extends MyMapper { +public interface AccountBindMapper extends CrudMapper { List getList(@Param("map") Map map); } \ No newline at end of file diff --git a/common/src/main/java/com/simon/mapper/AuthorityMapper.java b/common/src/main/java/com/simon/mapper/AuthorityMapper.java index c992583a931c7afcfaf062b0d6b04a21610650f0..2e0084cb8f8816866ccbdccc9439523f926c1e1c 100644 --- a/common/src/main/java/com/simon/mapper/AuthorityMapper.java +++ b/common/src/main/java/com/simon/mapper/AuthorityMapper.java @@ -1,6 +1,6 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.dto.AuthorityDto; import com.simon.model.Authority; import org.apache.ibatis.annotations.Param; @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; -public interface AuthorityMapper extends MyMapper { +public interface AuthorityMapper extends CrudMapper { /** * 查询权限 * @param userId diff --git a/common/src/main/java/com/simon/mapper/BillMapper.java b/common/src/main/java/com/simon/mapper/BillMapper.java index fba817d4cc98eececab99ac4d6d20e555fc1fd7c..f4950f571c26fb9dc313d4f80a6e6d4ec94e8f43 100644 --- a/common/src/main/java/com/simon/mapper/BillMapper.java +++ b/common/src/main/java/com/simon/mapper/BillMapper.java @@ -1,13 +1,13 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.model.Bill; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; -public interface BillMapper extends MyMapper { +public interface BillMapper extends CrudMapper { int updateBillStatusByOutTradeNo(String billStatus, String outTradeNo); List getDtoList(@Param("map") Map params); diff --git a/common/src/main/java/com/simon/mapper/CityMapper.java b/common/src/main/java/com/simon/mapper/CityMapper.java index cd510ba7f2fd8ca35276d27db1b3b623c66a3521..e935a68cb923324cfdf52110482b811c78db40a8 100644 --- a/common/src/main/java/com/simon/mapper/CityMapper.java +++ b/common/src/main/java/com/simon/mapper/CityMapper.java @@ -1,6 +1,6 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.dto.vue.CascaderOptionDto; import com.simon.model.City; import com.simon.provider.CityProvider; @@ -15,7 +15,7 @@ import java.util.Map; * @author SimonSun * @date 2019-04-24 **/ -public interface CityMapper extends MyMapper { +public interface CityMapper extends CrudMapper { /** * 使用Map查询 * @param map 查询条件 diff --git a/common/src/main/java/com/simon/mapper/ColumnUiMapper.java b/common/src/main/java/com/simon/mapper/ColumnUiMapper.java index 51c1b87d1ca3f9db9fcac620884298a1b776127a..fef939dfc00458fd17c5394243ab3e51c6f42994 100644 --- a/common/src/main/java/com/simon/mapper/ColumnUiMapper.java +++ b/common/src/main/java/com/simon/mapper/ColumnUiMapper.java @@ -1,6 +1,6 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.model.ColumnUi; import com.simon.provider.ColumnUiProvider; import org.apache.ibatis.annotations.ResultMap; @@ -13,7 +13,7 @@ import java.util.Map; * @author SimonSun * @date 2019-05-03 **/ -public interface ColumnUiMapper extends MyMapper { +public interface ColumnUiMapper extends CrudMapper { /** * 使用Map查询 * @param map 查询条件 diff --git a/common/src/main/java/com/simon/mapper/CountryMapper.java b/common/src/main/java/com/simon/mapper/CountryMapper.java index 9fa1194f223f310da7ba8d69484e378a219d47aa..0a297069e88ebd8aa216c3a6cb5ef970a96e2b5d 100644 --- a/common/src/main/java/com/simon/mapper/CountryMapper.java +++ b/common/src/main/java/com/simon/mapper/CountryMapper.java @@ -1,6 +1,6 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.dto.vue.CascaderOptionDto; import com.simon.model.Country; import com.simon.provider.CountryProvider; @@ -15,7 +15,7 @@ import java.util.Map; * @author SimonSun * @date 2019-04-24 **/ -public interface CountryMapper extends MyMapper { +public interface CountryMapper extends CrudMapper { /** * 使用Map查询 * @param map 查询条件 diff --git a/common/src/main/java/com/simon/mapper/DictTypeGroupMapper.java b/common/src/main/java/com/simon/mapper/DictTypeGroupMapper.java index 26bc721f36161f624ff55c5250eeed24114845d2..cc649a40d17c2fafd96eafc9a744fa187d1f34cc 100644 --- a/common/src/main/java/com/simon/mapper/DictTypeGroupMapper.java +++ b/common/src/main/java/com/simon/mapper/DictTypeGroupMapper.java @@ -1,6 +1,6 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.dto.DictTypeDto; import com.simon.dto.EasyUiTreeGridDto; import com.simon.dto.SelectDto; @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; -public interface DictTypeGroupMapper extends MyMapper { +public interface DictTypeGroupMapper extends CrudMapper { List getAll(@Param("language") String language); List getTreeGridDtos(@Param("name") String name, @Param("code") String code, @Param("language") String language); diff --git a/common/src/main/java/com/simon/mapper/DictTypeGroupMultiLanguageMapper.java b/common/src/main/java/com/simon/mapper/DictTypeGroupMultiLanguageMapper.java index 6469b48d6786bbd2497fcd7991f1635e6691c7df..b617502db8a17caa0eeae39c5cdcaae5cc4f4e78 100644 --- a/common/src/main/java/com/simon/mapper/DictTypeGroupMultiLanguageMapper.java +++ b/common/src/main/java/com/simon/mapper/DictTypeGroupMultiLanguageMapper.java @@ -1,26 +1,21 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.model.DictTypeGroupMultiLanguage; import com.simon.provider.DictTypeGroupMultiLanguageProvider; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.ResultMap; -import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.SelectProvider; import java.util.List; import java.util.Map; -import java.time.LocalTime; -import java.time.LocalDate; -import java.time.LocalDateTime; /** * @author jeesun * @date 2019-06-03 **/ @Mapper -public interface DictTypeGroupMultiLanguageMapper extends MyMapper { +public interface DictTypeGroupMultiLanguageMapper extends CrudMapper { /** * 使用Map查询 * @param map 查询条件 diff --git a/common/src/main/java/com/simon/mapper/DictTypeMapper.java b/common/src/main/java/com/simon/mapper/DictTypeMapper.java index b4c2f777e7e8278657bc750166e5a055e964d636..0b7a71294100d436d10bd18831f1b158a4090013 100644 --- a/common/src/main/java/com/simon/mapper/DictTypeMapper.java +++ b/common/src/main/java/com/simon/mapper/DictTypeMapper.java @@ -1,6 +1,6 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.dto.DictTypeDto; import com.simon.dto.EasyUiTreeGridDto; import com.simon.model.DictType; @@ -12,7 +12,7 @@ import java.util.Map; /** * @author simon */ -public interface DictTypeMapper extends MyMapper { +public interface DictTypeMapper extends CrudMapper { /** * 根据字典组编码查询字典列表 * @param groupCode diff --git a/common/src/main/java/com/simon/mapper/DictTypeMultiLanguageMapper.java b/common/src/main/java/com/simon/mapper/DictTypeMultiLanguageMapper.java index 7c08d690449085b26d8e710b73e20d9676b52c29..7424f6b1071539c9a14645ba6fda0393c5a8e553 100644 --- a/common/src/main/java/com/simon/mapper/DictTypeMultiLanguageMapper.java +++ b/common/src/main/java/com/simon/mapper/DictTypeMultiLanguageMapper.java @@ -1,6 +1,6 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.model.DictTypeMultiLanguage; import com.simon.provider.DictTypeMultiLanguageProvider; import org.apache.ibatis.annotations.Mapper; @@ -15,7 +15,7 @@ import java.util.Map; * @date 2019-06-03 **/ @Mapper -public interface DictTypeMultiLanguageMapper extends MyMapper { +public interface DictTypeMultiLanguageMapper extends CrudMapper { /** * 使用Map查询 * @param map 查询条件 diff --git a/common/src/main/java/com/simon/mapper/FontAwesomeMapper.java b/common/src/main/java/com/simon/mapper/FontAwesomeMapper.java index 92c77a987a979ebc42e4fc94207ce5f8c085e877..b8e7f7a12199adcaf3791088f1736caca614e26b 100644 --- a/common/src/main/java/com/simon/mapper/FontAwesomeMapper.java +++ b/common/src/main/java/com/simon/mapper/FontAwesomeMapper.java @@ -1,6 +1,6 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.dto.FontAwesomeDto; import com.simon.model.FontAwesome; import org.apache.ibatis.annotations.Param; @@ -11,7 +11,7 @@ import java.util.List; * @author SimonSun * @date 2019-04-29 **/ -public interface FontAwesomeMapper extends MyMapper { +public interface FontAwesomeMapper extends CrudMapper { /** * 使用Map查询 * @param map 查询条件 diff --git a/common/src/main/java/com/simon/mapper/LoggingEventMapper.java b/common/src/main/java/com/simon/mapper/LoggingEventMapper.java index eba1d64b3362b64004da2e932b105117356ba7c5..921c88101fd3e6718695dbfc92c874150e5eb302 100644 --- a/common/src/main/java/com/simon/mapper/LoggingEventMapper.java +++ b/common/src/main/java/com/simon/mapper/LoggingEventMapper.java @@ -1,12 +1,12 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.model.LoggingEvent; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; -public interface LoggingEventMapper extends MyMapper { +public interface LoggingEventMapper extends CrudMapper { List getList(@Param("map") Map map); } \ No newline at end of file diff --git a/common/src/main/java/com/simon/mapper/NewsInfoMapper.java b/common/src/main/java/com/simon/mapper/NewsInfoMapper.java index ac78cfdda4ec9c9865b2be80461abb8c922ac3c6..05e3d6b7f6126bcc553406e0bc1f2eb25c21fe6f 100644 --- a/common/src/main/java/com/simon/mapper/NewsInfoMapper.java +++ b/common/src/main/java/com/simon/mapper/NewsInfoMapper.java @@ -1,6 +1,6 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.model.NewsInfo; import com.simon.provider.NewsInfoProvider; import org.apache.ibatis.annotations.ResultMap; @@ -13,7 +13,7 @@ import java.util.Map; * @author SimonSun * @date 2019-01-20 **/ -public interface NewsInfoMapper extends MyMapper { +public interface NewsInfoMapper extends CrudMapper { /** * 使用Map查询 * @param map 查询条件 diff --git a/common/src/main/java/com/simon/mapper/NewsTagMapper.java b/common/src/main/java/com/simon/mapper/NewsTagMapper.java index 4abc1bf22d924cbb913bcf4b0fc7a887a5d157ed..c2450635c77ad4ab6e8d673b052dae8316522ec5 100644 --- a/common/src/main/java/com/simon/mapper/NewsTagMapper.java +++ b/common/src/main/java/com/simon/mapper/NewsTagMapper.java @@ -1,12 +1,12 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.model.NewsTag; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; -public interface NewsTagMapper extends MyMapper { +public interface NewsTagMapper extends CrudMapper { List getList(@Param("map") Map map); } \ No newline at end of file diff --git a/common/src/main/java/com/simon/mapper/NoticeMsgMapper.java b/common/src/main/java/com/simon/mapper/NoticeMsgMapper.java index 5026761c73cba99b0d8df63a6fe552ec5d912e07..5303d533807d67cd4a9fbd5127b40d1eba9b8634 100644 --- a/common/src/main/java/com/simon/mapper/NoticeMsgMapper.java +++ b/common/src/main/java/com/simon/mapper/NoticeMsgMapper.java @@ -1,12 +1,12 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.model.NoticeMsg; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; -public interface NoticeMsgMapper extends MyMapper { +public interface NoticeMsgMapper extends CrudMapper { List getList(@Param("map") Map map); } \ No newline at end of file diff --git a/common/src/main/java/com/simon/mapper/OauthUserMapper.java b/common/src/main/java/com/simon/mapper/OauthUserMapper.java index 18c5b477d881284a2e8c16e925f393f591100791..22ae492515ae374be1037ed20d3c897fde5693bb 100644 --- a/common/src/main/java/com/simon/mapper/OauthUserMapper.java +++ b/common/src/main/java/com/simon/mapper/OauthUserMapper.java @@ -1,6 +1,6 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.dto.AuthorityDto; import com.simon.model.OauthUser; import com.simon.provider.OauthUserProvider; @@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.SelectProvider; import java.util.List; import java.util.Map; -public interface OauthUserMapper extends MyMapper { +public interface OauthUserMapper extends CrudMapper { int updatePwdByPhone(@Param("phone") String phone, @Param("password") String password); /** diff --git a/common/src/main/java/com/simon/mapper/ProvinceMapper.java b/common/src/main/java/com/simon/mapper/ProvinceMapper.java index ab58a5ca9210d2364d24204decdd5891ab64e1f3..e48e244e919865704daeeeb2d50bcbceb3d10f39 100644 --- a/common/src/main/java/com/simon/mapper/ProvinceMapper.java +++ b/common/src/main/java/com/simon/mapper/ProvinceMapper.java @@ -1,6 +1,6 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.dto.vue.CascaderOptionDto; import com.simon.model.Province; import com.simon.provider.ProvinceProvider; @@ -14,7 +14,7 @@ import java.util.Map; * @author SimonSun * @date 2019-04-24 **/ -public interface ProvinceMapper extends MyMapper { +public interface ProvinceMapper extends CrudMapper { /** * 使用Map查询 * @param map 查询条件 diff --git a/common/src/main/java/com/simon/mapper/QuartzJobMapper.java b/common/src/main/java/com/simon/mapper/QuartzJobMapper.java index 6df27adea45bd647fba701d8946a47d8f2df7ee5..8204975717915860cc722988da2dc725678eddb0 100644 --- a/common/src/main/java/com/simon/mapper/QuartzJobMapper.java +++ b/common/src/main/java/com/simon/mapper/QuartzJobMapper.java @@ -1,6 +1,6 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.model.QuartzJob; import org.apache.ibatis.annotations.Param; @@ -12,7 +12,7 @@ import java.util.Map; * @author SimonSun * @date 2018-12-22 **/ -public interface QuartzJobMapper extends MyMapper { +public interface QuartzJobMapper extends CrudMapper { /** * 使用Map查询 * @param map map查询条件 diff --git a/common/src/main/java/com/simon/mapper/ResetPwdInfoMapper.java b/common/src/main/java/com/simon/mapper/ResetPwdInfoMapper.java index 8ae8f0c812885c9234c60173a7c88ebbeb07c72f..61e8e04a0ce842b33f6105638bdfcc7228f4b322 100644 --- a/common/src/main/java/com/simon/mapper/ResetPwdInfoMapper.java +++ b/common/src/main/java/com/simon/mapper/ResetPwdInfoMapper.java @@ -1,12 +1,12 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.model.ResetPwdInfo; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; -public interface ResetPwdInfoMapper extends MyMapper { +public interface ResetPwdInfoMapper extends CrudMapper { List getList(@Param("map") Map map); } \ No newline at end of file diff --git a/common/src/main/java/com/simon/mapper/SideMenuAuthorityMapper.java b/common/src/main/java/com/simon/mapper/SideMenuAuthorityMapper.java index 9b5481cd422ff9da107847ea7ecf42385e5d8c45..c37517f583a8103f48382716686e4c0489b10950 100644 --- a/common/src/main/java/com/simon/mapper/SideMenuAuthorityMapper.java +++ b/common/src/main/java/com/simon/mapper/SideMenuAuthorityMapper.java @@ -1,6 +1,6 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.model.SideMenuAuthority; import com.simon.provider.SideMenuAuthorityProvider; import org.apache.ibatis.annotations.Param; @@ -13,7 +13,7 @@ import java.util.Map; * @author SimonSun * @date 2019-01-14 **/ -public interface SideMenuAuthorityMapper extends MyMapper { +public interface SideMenuAuthorityMapper extends CrudMapper { /** * 使用Map查询 * @param map 查询条件 diff --git a/common/src/main/java/com/simon/mapper/SideMenuMapper.java b/common/src/main/java/com/simon/mapper/SideMenuMapper.java index ba1eb9c42c681cc7d14177a38a443faf27ab1a8f..443782212bd5196bbc5fdfda02f49702967714fe 100644 --- a/common/src/main/java/com/simon/mapper/SideMenuMapper.java +++ b/common/src/main/java/com/simon/mapper/SideMenuMapper.java @@ -1,6 +1,6 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.dto.ButtonAuthorityDto; import com.simon.dto.EasyUiTreeDto; import com.simon.dto.SideMenuDto; @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; @Mapper -public interface SideMenuMapper extends MyMapper { +public interface SideMenuMapper extends CrudMapper { List selectByPid(@Param("pid") Long pid, @Param("language") String language); /** diff --git a/common/src/main/java/com/simon/mapper/SideMenuMultiLanguageMapper.java b/common/src/main/java/com/simon/mapper/SideMenuMultiLanguageMapper.java index 8080f1fe6d4f3a8f288162e1f6258b5b3eb0c53a..09928265b827a0cb4ff26823cbce3c1f6ce1b472 100644 --- a/common/src/main/java/com/simon/mapper/SideMenuMultiLanguageMapper.java +++ b/common/src/main/java/com/simon/mapper/SideMenuMultiLanguageMapper.java @@ -1,6 +1,6 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.model.SideMenuMultiLanguage; import com.simon.provider.SideMenuMultiLanguageProvider; import org.apache.ibatis.annotations.*; @@ -13,7 +13,7 @@ import java.util.Map; * @date 2019-05-30 **/ @Mapper -public interface SideMenuMultiLanguageMapper extends MyMapper { +public interface SideMenuMultiLanguageMapper extends CrudMapper { /** * 使用Map查询 * @param map 查询条件 diff --git a/common/src/main/java/com/simon/mapper/TownMapper.java b/common/src/main/java/com/simon/mapper/TownMapper.java index 74fa7e41234beb3a1787d4b7bfffeebe329e698f..53eb922dbc7f18d1ab4d3e7a269e17835934a05c 100644 --- a/common/src/main/java/com/simon/mapper/TownMapper.java +++ b/common/src/main/java/com/simon/mapper/TownMapper.java @@ -1,6 +1,6 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.model.Town; import com.simon.provider.TownProvider; import org.apache.ibatis.annotations.ResultMap; @@ -13,7 +13,7 @@ import java.util.Map; * @author SimonSun * @date 2019-04-25 **/ -public interface TownMapper extends MyMapper { +public interface TownMapper extends CrudMapper { /** * 使用Map查询 * @param map 查询条件 diff --git a/common/src/main/java/com/simon/mapper/VillageMapper.java b/common/src/main/java/com/simon/mapper/VillageMapper.java index b1e742cbca368125da924b5943dd8b4439cc55ef..08484f5b1f0a6688f1c1d78b2e8bf7c38e18fb23 100644 --- a/common/src/main/java/com/simon/mapper/VillageMapper.java +++ b/common/src/main/java/com/simon/mapper/VillageMapper.java @@ -1,6 +1,6 @@ package com.simon.mapper; -import com.simon.common.mapper.MyMapper; +import com.simon.common.mapper.CrudMapper; import com.simon.model.Village; import com.simon.provider.VillageProvider; import org.apache.ibatis.annotations.ResultMap; @@ -13,7 +13,7 @@ import java.util.Map; * @author SimonSun * @date 2019-04-24 **/ -public interface VillageMapper extends MyMapper { +public interface VillageMapper extends CrudMapper { /** * 使用Map查询 * @param map 查询条件 diff --git a/common/src/main/java/com/simon/model/AccountBind.java b/common/src/main/java/com/simon/model/AccountBind.java index 6f6f13870f3321874dcfd32b6a9d1053c2226852..93d44cedc56bc72edebd50b746ea62bdcd1cce1c 100644 --- a/common/src/main/java/com/simon/model/AccountBind.java +++ b/common/src/main/java/com/simon/model/AccountBind.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.ToStringSerializer; import com.fasterxml.jackson.annotation.JsonFormat; import com.simon.common.config.AppConfig; +import com.simon.common.domain.BasePo; import com.simon.common.utils.SnowflakeGenId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -26,7 +27,7 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = false) @Entity @Table(name="t_account_bind") -public class AccountBind implements Serializable{ +public class AccountBind extends BasePo implements Serializable{ private static final long serialVersionUID = 1L; @JSONField(serializeUsing = ToStringSerializer.class) diff --git a/common/src/main/java/com/simon/model/Authority.java b/common/src/main/java/com/simon/model/Authority.java index 74d45898792e34a43443aaba86f31d2005c6c080..340157c08b8991ecd12741a4ef8d78276e898f0c 100644 --- a/common/src/main/java/com/simon/model/Authority.java +++ b/common/src/main/java/com/simon/model/Authority.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.ToStringSerializer; import com.fasterxml.jackson.annotation.JsonFormat; import com.simon.common.config.AppConfig; +import com.simon.common.domain.BasePo; import com.simon.common.utils.SnowflakeGenId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -26,7 +27,7 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = false) @Entity @Table(name="t_authorities") -public class Authority implements GrantedAuthority, Serializable, Comparable{ +public class Authority extends BasePo implements GrantedAuthority, Serializable, Comparable{ private static final long serialVersionUID = 1L; @JSONField(serializeUsing = ToStringSerializer.class) diff --git a/common/src/main/java/com/simon/model/Bill.java b/common/src/main/java/com/simon/model/Bill.java index ab6980f339aef8701b56ef9c6dcc8400ad4e5df2..be1457b41d95b5789ca4f7814d3487caae6578dc 100644 --- a/common/src/main/java/com/simon/model/Bill.java +++ b/common/src/main/java/com/simon/model/Bill.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.ToStringSerializer; import com.fasterxml.jackson.annotation.JsonFormat; import com.simon.common.config.AppConfig; +import com.simon.common.domain.BasePo; import com.simon.common.utils.SnowflakeGenId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -26,7 +27,7 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = false) @Entity @Table(name="t_bill") -public class Bill implements Serializable{ +public class Bill extends BasePo implements Serializable{ private static final long serialVersionUID = 1L; @JSONField(serializeUsing = ToStringSerializer.class) diff --git a/common/src/main/java/com/simon/model/City.java b/common/src/main/java/com/simon/model/City.java index 910e5984d20af3dfd242287dca2837ba92238775..4825a017868a4919ba3ca5b08f4ba3c22eb64ea2 100644 --- a/common/src/main/java/com/simon/model/City.java +++ b/common/src/main/java/com/simon/model/City.java @@ -1,5 +1,6 @@ package com.simon.model; +import com.simon.common.domain.BasePo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,7 +19,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = false) @Entity @Table(name="t_s_city") -public class City implements Serializable{ +public class City extends BasePo implements Serializable{ private static final long serialVersionUID = 1L; @Id diff --git a/common/src/main/java/com/simon/model/ColumnUi.java b/common/src/main/java/com/simon/model/ColumnUi.java index 136777204be8bf05628b95a2a811fd4f74ef75d5..f9adf74228e798343c9a8428bc54a75c5b71f8be 100644 --- a/common/src/main/java/com/simon/model/ColumnUi.java +++ b/common/src/main/java/com/simon/model/ColumnUi.java @@ -1,5 +1,6 @@ package com.simon.model; +import com.simon.common.domain.BasePo; import com.simon.common.utils.SnowflakeGenId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -22,7 +23,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = false) @Entity @Table(name = "t_s_column_ui") -public class ColumnUi implements Serializable { +public class ColumnUi extends BasePo implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/common/src/main/java/com/simon/model/Country.java b/common/src/main/java/com/simon/model/Country.java index 868810e351c8eddb24769ea0c53a6498d6032001..51920cc51f6f26a71668bea7fdc714b1677f68c1 100644 --- a/common/src/main/java/com/simon/model/Country.java +++ b/common/src/main/java/com/simon/model/Country.java @@ -1,5 +1,6 @@ package com.simon.model; +import com.simon.common.domain.BasePo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,7 +19,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = false) @Entity @Table(name="t_s_country") -public class Country implements Serializable{ +public class Country extends BasePo implements Serializable{ private static final long serialVersionUID = 1L; @Id diff --git a/common/src/main/java/com/simon/model/DictType.java b/common/src/main/java/com/simon/model/DictType.java index 78f9b37c1640900a50bc1ff099829e985d0696fe..40eb2e87b2d4dec1fec7d05bb85d6b2133156956 100644 --- a/common/src/main/java/com/simon/model/DictType.java +++ b/common/src/main/java/com/simon/model/DictType.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.ToStringSerializer; import com.fasterxml.jackson.annotation.JsonFormat; import com.simon.common.config.AppConfig; +import com.simon.common.domain.BasePo; import com.simon.common.utils.SnowflakeGenId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -25,7 +26,7 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = false) @Entity @Table(name="t_dict_type") -public class DictType implements Serializable{ +public class DictType extends BasePo implements Serializable{ private static final long serialVersionUID = 1L; @JSONField(serializeUsing = ToStringSerializer.class) diff --git a/common/src/main/java/com/simon/model/DictTypeGroup.java b/common/src/main/java/com/simon/model/DictTypeGroup.java index 940c95285c0f7b43e54ac68822e7ce7c8a41112c..ebd364ce1ef24ba956c3ee7b99ea04b3faae77cc 100644 --- a/common/src/main/java/com/simon/model/DictTypeGroup.java +++ b/common/src/main/java/com/simon/model/DictTypeGroup.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.ToStringSerializer; import com.fasterxml.jackson.annotation.JsonFormat; import com.simon.common.config.AppConfig; +import com.simon.common.domain.BasePo; import com.simon.common.utils.SnowflakeGenId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -26,7 +27,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = false) @Entity @Table(name="t_dict_type_group") -public class DictTypeGroup implements Serializable{ +public class DictTypeGroup extends BasePo implements Serializable{ private static final long serialVersionUID = 1L; @JSONField(serializeUsing = ToStringSerializer.class) diff --git a/common/src/main/java/com/simon/model/DictTypeGroupMultiLanguage.java b/common/src/main/java/com/simon/model/DictTypeGroupMultiLanguage.java index f1b1912334fa2cc559129ecf5b38014f78ce0e50..296f8b8cd9889a6370b99bcd9bc9d5ca26496ac7 100644 --- a/common/src/main/java/com/simon/model/DictTypeGroupMultiLanguage.java +++ b/common/src/main/java/com/simon/model/DictTypeGroupMultiLanguage.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.ToStringSerializer; import com.fasterxml.jackson.annotation.JsonFormat; import com.simon.common.config.AppConfig; +import com.simon.common.domain.BasePo; import com.simon.common.utils.SnowflakeGenId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -26,7 +27,7 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = false) @Entity @Table(name="t_s_dtg_multi_languages") -public class DictTypeGroupMultiLanguage implements Serializable{ +public class DictTypeGroupMultiLanguage extends BasePo implements Serializable{ private static final long serialVersionUID = 1L; @JSONField(serializeUsing = ToStringSerializer.class) diff --git a/common/src/main/java/com/simon/model/DictTypeMultiLanguage.java b/common/src/main/java/com/simon/model/DictTypeMultiLanguage.java index 3b6b25dddd2646ee009d259a44041bb6e68d7c65..f4737c42f0661da68357bb5dbd885e549b2dfe18 100644 --- a/common/src/main/java/com/simon/model/DictTypeMultiLanguage.java +++ b/common/src/main/java/com/simon/model/DictTypeMultiLanguage.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.ToStringSerializer; import com.fasterxml.jackson.annotation.JsonFormat; import com.simon.common.config.AppConfig; +import com.simon.common.domain.BasePo; import com.simon.common.utils.SnowflakeGenId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -26,7 +27,7 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = false) @Entity @Table(name="t_s_dt_multi_languages") -public class DictTypeMultiLanguage implements Serializable{ +public class DictTypeMultiLanguage extends BasePo implements Serializable{ private static final long serialVersionUID = 1L; @JSONField(serializeUsing = ToStringSerializer.class) diff --git a/common/src/main/java/com/simon/model/FontAwesome.java b/common/src/main/java/com/simon/model/FontAwesome.java index 2cc7154825f4a86d0686db4d8cc94b9790c46cfe..55fb96f330719221bc8bf7398c5613ef9f00dc7b 100644 --- a/common/src/main/java/com/simon/model/FontAwesome.java +++ b/common/src/main/java/com/simon/model/FontAwesome.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.ToStringSerializer; import com.fasterxml.jackson.annotation.JsonFormat; import com.simon.common.config.AppConfig; +import com.simon.common.domain.BasePo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,7 +24,7 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = false) @Entity @Table(name="t_s_font_awesome") -public class FontAwesome implements Serializable{ +public class FontAwesome extends BasePo implements Serializable{ private static final long serialVersionUID = 1L; @Id diff --git a/common/src/main/java/com/simon/model/NewsInfo.java b/common/src/main/java/com/simon/model/NewsInfo.java index 4fb21db980318361db6e15783c525db92b223c2b..33f691b85b46e9a6cfe2c9010f73ea6ca35dd82e 100644 --- a/common/src/main/java/com/simon/model/NewsInfo.java +++ b/common/src/main/java/com/simon/model/NewsInfo.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.ToStringSerializer; import com.fasterxml.jackson.annotation.JsonFormat; import com.simon.common.config.AppConfig; +import com.simon.common.domain.BasePo; import com.simon.common.utils.SnowflakeGenId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -26,7 +27,7 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = false) @Entity @Table(name="t_news_info") -public class NewsInfo implements Serializable{ +public class NewsInfo extends BasePo implements Serializable{ private static final long serialVersionUID = 1L; @JSONField(serializeUsing = ToStringSerializer.class) diff --git a/common/src/main/java/com/simon/model/NewsTag.java b/common/src/main/java/com/simon/model/NewsTag.java index 2ac9683d2b254966cb3db912d49dda6ebcaf28d5..722d7015ef736f599327468ddc5c58bc2129d42e 100644 --- a/common/src/main/java/com/simon/model/NewsTag.java +++ b/common/src/main/java/com/simon/model/NewsTag.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.ToStringSerializer; import com.fasterxml.jackson.annotation.JsonFormat; import com.simon.common.config.AppConfig; +import com.simon.common.domain.BasePo; import com.simon.common.utils.SnowflakeGenId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -25,7 +26,7 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = false) @Entity @Table(name="t_news_tag") -public class NewsTag implements Serializable{ +public class NewsTag extends BasePo implements Serializable{ private static final long serialVersionUID = 1L; @JSONField(serializeUsing = ToStringSerializer.class) diff --git a/common/src/main/java/com/simon/model/NoticeMsg.java b/common/src/main/java/com/simon/model/NoticeMsg.java index 631f01b07e0f8ee20180914ab2906e56b558dcdc..10f5092ba636a3ba59d5c69f6342c0e43607b8cd 100644 --- a/common/src/main/java/com/simon/model/NoticeMsg.java +++ b/common/src/main/java/com/simon/model/NoticeMsg.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.ToStringSerializer; import com.fasterxml.jackson.annotation.JsonFormat; import com.simon.common.config.AppConfig; +import com.simon.common.domain.BasePo; import com.simon.common.utils.SnowflakeGenId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -26,7 +27,7 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = false) @Entity @Table(name="t_notice_msg") -public class NoticeMsg implements Serializable{ +public class NoticeMsg extends BasePo implements Serializable{ private static final long serialVersionUID = 1L; @JSONField(serializeUsing = ToStringSerializer.class) diff --git a/common/src/main/java/com/simon/model/OauthUser.java b/common/src/main/java/com/simon/model/OauthUser.java index ff7cc2a0623d7e815331520963e471cf259bc482..2b178135a16f5265607f06486e3780eb21956c95 100644 --- a/common/src/main/java/com/simon/model/OauthUser.java +++ b/common/src/main/java/com/simon/model/OauthUser.java @@ -8,6 +8,7 @@ import com.github.liaochong.myexcel.core.annotation.ExcelColumn; import com.github.liaochong.myexcel.core.annotation.ExcelTable; import com.github.liaochong.myexcel.core.annotation.ExcludeColumn; import com.simon.common.config.AppConfig; +import com.simon.common.domain.BasePo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -30,7 +31,7 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = false) @Entity @Table(name="t_users") -public class OauthUser implements Serializable{ +public class OauthUser extends BasePo implements Serializable{ @ExcludeColumn private static final long serialVersionUID = 4898481229724057581L; diff --git a/common/src/main/java/com/simon/model/Province.java b/common/src/main/java/com/simon/model/Province.java index 5d9be096017aac61ce2b306937bec34eb563dd54..8b9bba64bfa572b6d23b3590d3b8d8a7313f4719 100644 --- a/common/src/main/java/com/simon/model/Province.java +++ b/common/src/main/java/com/simon/model/Province.java @@ -1,5 +1,6 @@ package com.simon.model; +import com.simon.common.domain.BasePo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,7 +19,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = false) @Entity @Table(name="t_s_province") -public class Province implements Serializable{ +public class Province extends BasePo implements Serializable{ private static final long serialVersionUID = 1L; @Id diff --git a/common/src/main/java/com/simon/model/QuartzJob.java b/common/src/main/java/com/simon/model/QuartzJob.java index d4ab7a16d4dd071195f8f4bc5d832c44528253a8..128738ada78ae825b13bd05d2e6e79f5dc3b0365 100644 --- a/common/src/main/java/com/simon/model/QuartzJob.java +++ b/common/src/main/java/com/simon/model/QuartzJob.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.ToStringSerializer; import com.fasterxml.jackson.annotation.JsonFormat; import com.simon.common.config.AppConfig; +import com.simon.common.domain.BasePo; import com.simon.common.utils.SnowflakeGenId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -26,7 +27,7 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = false) @Entity @Table(name="t_s_quartz_job") -public class QuartzJob implements Serializable{ +public class QuartzJob extends BasePo implements Serializable{ private static final long serialVersionUID = 1L; @JSONField(serializeUsing = ToStringSerializer.class) diff --git a/common/src/main/java/com/simon/model/ResetPwdInfo.java b/common/src/main/java/com/simon/model/ResetPwdInfo.java index 4c39d86c25769e884c53d118bb5959bf3c3dd2c0..52a50cf4969fbd49f3315fddce9597027bbe02fa 100644 --- a/common/src/main/java/com/simon/model/ResetPwdInfo.java +++ b/common/src/main/java/com/simon/model/ResetPwdInfo.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.ToStringSerializer; import com.fasterxml.jackson.annotation.JsonFormat; import com.simon.common.config.AppConfig; +import com.simon.common.domain.BasePo; import com.simon.common.utils.SnowflakeGenId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -25,7 +26,7 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = false) @Entity @Table(name="t_reset_pwd_info") -public class ResetPwdInfo implements Serializable{ +public class ResetPwdInfo extends BasePo implements Serializable{ private static final long serialVersionUID = 1L; @JSONField(serializeUsing = ToStringSerializer.class) diff --git a/common/src/main/java/com/simon/model/SideMenu.java b/common/src/main/java/com/simon/model/SideMenu.java index 6e2f6b1fa84ea1072e0fc70e470463cb5cee54b6..c78bcf9e084c10d0cb10e7e5acbbf2e674380207 100644 --- a/common/src/main/java/com/simon/model/SideMenu.java +++ b/common/src/main/java/com/simon/model/SideMenu.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.ToStringSerializer; import com.fasterxml.jackson.annotation.JsonFormat; import com.simon.common.config.AppConfig; +import com.simon.common.domain.BasePo; import com.simon.common.utils.SnowflakeGenId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -28,7 +29,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = false) @Entity @Table(name = "t_side_menu") -public class SideMenu implements Serializable { +public class SideMenu extends BasePo implements Serializable { private static final long serialVersionUID = 1L; @JSONField(serializeUsing = ToStringSerializer.class) diff --git a/common/src/main/java/com/simon/model/SideMenuAuthority.java b/common/src/main/java/com/simon/model/SideMenuAuthority.java index 4f223e0af90b047c53e839b0507f12b7ddbf6d47..37157372369aa641b67e11c8bd076647174bd6c6 100644 --- a/common/src/main/java/com/simon/model/SideMenuAuthority.java +++ b/common/src/main/java/com/simon/model/SideMenuAuthority.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.ToStringSerializer; import com.fasterxml.jackson.annotation.JsonFormat; import com.simon.common.config.AppConfig; +import com.simon.common.domain.BasePo; import com.simon.common.utils.SnowflakeGenId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -26,7 +27,7 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = false) @Entity @Table(name="t_side_menu_authority") -public class SideMenuAuthority implements Serializable{ +public class SideMenuAuthority extends BasePo implements Serializable{ private static final long serialVersionUID = 1L; @JSONField(serializeUsing = ToStringSerializer.class) diff --git a/common/src/main/java/com/simon/model/SideMenuMultiLanguage.java b/common/src/main/java/com/simon/model/SideMenuMultiLanguage.java index ddbc3e40d29c3f8f9899e6758f6d020c0d7bb46b..403b6fd656c305551e664656057ae060547826e0 100644 --- a/common/src/main/java/com/simon/model/SideMenuMultiLanguage.java +++ b/common/src/main/java/com/simon/model/SideMenuMultiLanguage.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.ToStringSerializer; import com.fasterxml.jackson.annotation.JsonFormat; import com.simon.common.config.AppConfig; +import com.simon.common.domain.BasePo; import com.simon.common.utils.SnowflakeGenId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -26,7 +27,7 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = false) @Entity @Table(name="t_s_side_menu_multi_languages") -public class SideMenuMultiLanguage implements Serializable{ +public class SideMenuMultiLanguage extends BasePo implements Serializable{ private static final long serialVersionUID = 1L; @JSONField(serializeUsing = ToStringSerializer.class) diff --git a/common/src/main/java/com/simon/model/Town.java b/common/src/main/java/com/simon/model/Town.java index b1c0424bc8d8f180eeac4bf5da5a417b7ba74cd4..8573086d8797c295b3e288692e7722342a87a404 100644 --- a/common/src/main/java/com/simon/model/Town.java +++ b/common/src/main/java/com/simon/model/Town.java @@ -1,5 +1,6 @@ package com.simon.model; +import com.simon.common.domain.BasePo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,7 +19,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = false) @Entity @Table(name="t_s_town") -public class Town implements Serializable{ +public class Town extends BasePo implements Serializable{ private static final long serialVersionUID = 1L; @Id diff --git a/common/src/main/java/com/simon/model/Village.java b/common/src/main/java/com/simon/model/Village.java index c3f567cbebcd16dc5ce5f001ac25646eeedceebd..238256b3e8ea97cdadb59729bf2b4582724a74e0 100644 --- a/common/src/main/java/com/simon/model/Village.java +++ b/common/src/main/java/com/simon/model/Village.java @@ -1,5 +1,6 @@ package com.simon.model; +import com.simon.common.domain.BasePo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,7 +19,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = false) @Entity @Table(name="t_s_village") -public class Village implements Serializable{ +public class Village extends BasePo implements Serializable{ private static final long serialVersionUID = 1L; @Id diff --git a/common/src/main/java/com/simon/service/AccountBindService.java b/common/src/main/java/com/simon/service/AccountBindService.java index b948abe0bea8159ce64b20ee63f449b15023dd5a..0fb586293d518bcae50c8ab06350a1c93080acf3 100644 --- a/common/src/main/java/com/simon/service/AccountBindService.java +++ b/common/src/main/java/com/simon/service/AccountBindService.java @@ -1,12 +1,12 @@ package com.simon.service; -import com.simon.common.service.BasicService; +import com.simon.common.service.CrudService; import com.simon.model.AccountBind; /** * @author SimonSun * @date 2018-12-04 **/ -public interface AccountBindService extends BasicService { +public interface AccountBindService extends CrudService { } \ No newline at end of file diff --git a/common/src/main/java/com/simon/service/AuthorityService.java b/common/src/main/java/com/simon/service/AuthorityService.java index afd6630453c3f018c8ca0fe64aa37e0c98b5f758..ad12a842b16e3fdb8a24be6416a7c8876f85b2cc 100644 --- a/common/src/main/java/com/simon/service/AuthorityService.java +++ b/common/src/main/java/com/simon/service/AuthorityService.java @@ -1,7 +1,7 @@ package com.simon.service; import com.github.pagehelper.PageInfo; -import com.simon.common.service.BasicService; +import com.simon.common.service.CrudService; import com.simon.dto.AuthorityDto; import com.simon.model.Authority; @@ -11,7 +11,7 @@ import java.util.List; * @author SimonSun * @date 2018-11-14 **/ -public interface AuthorityService extends BasicService { +public interface AuthorityService extends CrudService { PageInfo getDtoList(Long userId, String username, String authority, String language, Integer pageNo, Integer pageSize, String orderBy); List findByUserId(Long userId); diff --git a/common/src/main/java/com/simon/service/BillService.java b/common/src/main/java/com/simon/service/BillService.java index f0c6e539915baeb7f56968f07e3ab872c6184d7f..925fdc4a9ac56199e4d48f9f81a26bcf9ee401d6 100644 --- a/common/src/main/java/com/simon/service/BillService.java +++ b/common/src/main/java/com/simon/service/BillService.java @@ -1,7 +1,7 @@ package com.simon.service; import com.github.pagehelper.PageInfo; -import com.simon.common.service.BasicService; +import com.simon.common.service.CrudService; import com.simon.model.Bill; import com.simon.model.OauthUser; import com.simon.request.BillRequest; @@ -12,7 +12,7 @@ import java.util.Map; * @author SimonSun * @date 2018-11-20 **/ -public interface BillService extends BasicService { +public interface BillService extends CrudService { Bill createBill(BillRequest billRequest); Bill createBill(OauthUser oauthUser, BillRequest billRequest); diff --git a/common/src/main/java/com/simon/service/CityService.java b/common/src/main/java/com/simon/service/CityService.java index 23cb4372cf271421d8e008c90e32e3e8c19ae6a7..d3eaa7ba8b03885c7559cafc8be0c3c914cc5440 100644 --- a/common/src/main/java/com/simon/service/CityService.java +++ b/common/src/main/java/com/simon/service/CityService.java @@ -1,6 +1,6 @@ package com.simon.service; -import com.simon.common.service.BasicService; +import com.simon.common.service.CrudService; import com.simon.dto.vue.CascaderOptionDto; import com.simon.model.City; @@ -10,7 +10,7 @@ import java.util.List; * @author SimonSun * @date 2019-04-24 **/ -public interface CityService extends BasicService { +public interface CityService extends CrudService { /** * 根据省id查询省下面的城市 * @param provinceId 省id diff --git a/common/src/main/java/com/simon/service/ColumnUiService.java b/common/src/main/java/com/simon/service/ColumnUiService.java index b3842403f94c53f859ab0aef989cfd4a7e0aea63..1a8a4a79cf13a6519b0c7dcfa5f2dfd516d11c08 100644 --- a/common/src/main/java/com/simon/service/ColumnUiService.java +++ b/common/src/main/java/com/simon/service/ColumnUiService.java @@ -1,6 +1,6 @@ package com.simon.service; -import com.simon.common.service.BasicService; +import com.simon.common.service.CrudService; import com.simon.model.ColumnUi; import java.util.List; @@ -9,7 +9,7 @@ import java.util.List; * @author SimonSun * @date 2019-05-03 **/ -public interface ColumnUiService extends BasicService { +public interface ColumnUiService extends CrudService { /** * 根据表名查询 * @param tableName 表名 diff --git a/common/src/main/java/com/simon/service/CountryService.java b/common/src/main/java/com/simon/service/CountryService.java index 89467f1a434936ff1cd9c264dd25f0c65b0c1719..d4102e23ab5249098587d5626ed1359531b115cc 100644 --- a/common/src/main/java/com/simon/service/CountryService.java +++ b/common/src/main/java/com/simon/service/CountryService.java @@ -1,6 +1,6 @@ package com.simon.service; -import com.simon.common.service.BasicService; +import com.simon.common.service.CrudService; import com.simon.dto.vue.CascaderOptionDto; import com.simon.model.Country; @@ -10,7 +10,7 @@ import java.util.List; * @author SimonSun * @date 2019-04-24 **/ -public interface CountryService extends BasicService { +public interface CountryService extends CrudService { /** * 根据城市id获取区列表 * @param cityId 城市id diff --git a/common/src/main/java/com/simon/service/DictTypeGroupMultiLanguageService.java b/common/src/main/java/com/simon/service/DictTypeGroupMultiLanguageService.java index 3a8cc2daebf879f378460e64e47ffc93d62009b6..6190f561d0324f882e0d1e34c20a76eb487374a3 100644 --- a/common/src/main/java/com/simon/service/DictTypeGroupMultiLanguageService.java +++ b/common/src/main/java/com/simon/service/DictTypeGroupMultiLanguageService.java @@ -1,15 +1,11 @@ package com.simon.service; import com.simon.model.DictTypeGroupMultiLanguage; -import com.simon.common.service.BasicService; - -import java.time.LocalTime; -import java.time.LocalDate; -import java.time.LocalDateTime; +import com.simon.common.service.CrudService; /** * @author jeesun * @date 2019-06-03 **/ -public interface DictTypeGroupMultiLanguageService extends BasicService { +public interface DictTypeGroupMultiLanguageService extends CrudService { } \ No newline at end of file diff --git a/common/src/main/java/com/simon/service/DictTypeGroupService.java b/common/src/main/java/com/simon/service/DictTypeGroupService.java index ab611cfb78b341f02fd6caeb0171fa492e33eb5b..8478528fada9582dcc72003b56a48ea170b83888 100644 --- a/common/src/main/java/com/simon/service/DictTypeGroupService.java +++ b/common/src/main/java/com/simon/service/DictTypeGroupService.java @@ -1,7 +1,7 @@ package com.simon.service; import com.github.pagehelper.PageInfo; -import com.simon.common.service.BasicService; +import com.simon.common.service.CrudService; import com.simon.dto.DictTypeDto; import com.simon.dto.EasyUiTreeGridDto; import com.simon.dto.SelectDto; @@ -13,7 +13,7 @@ import java.util.List; * @author SimonSun * @date 2018-09-06 10:03:50 **/ -public interface DictTypeGroupService extends BasicService { +public interface DictTypeGroupService extends CrudService { List getDtos(String language, Integer limit, Integer offset); PageInfo getTreeGridDtos(String name, String code, String language, Integer pageNo, Integer pageSize, String orderBy); diff --git a/common/src/main/java/com/simon/service/DictTypeMultiLanguageService.java b/common/src/main/java/com/simon/service/DictTypeMultiLanguageService.java index 5f7b4fa2dcd918fdf7c2ce2879564c997e7baed2..c20ec084860ab1077f3a7aa5d3934695573b8af3 100644 --- a/common/src/main/java/com/simon/service/DictTypeMultiLanguageService.java +++ b/common/src/main/java/com/simon/service/DictTypeMultiLanguageService.java @@ -1,15 +1,11 @@ package com.simon.service; import com.simon.model.DictTypeMultiLanguage; -import com.simon.common.service.BasicService; - -import java.time.LocalTime; -import java.time.LocalDate; -import java.time.LocalDateTime; +import com.simon.common.service.CrudService; /** * @author jeesun * @date 2019-06-03 **/ -public interface DictTypeMultiLanguageService extends BasicService { +public interface DictTypeMultiLanguageService extends CrudService { } \ No newline at end of file diff --git a/common/src/main/java/com/simon/service/DictTypeService.java b/common/src/main/java/com/simon/service/DictTypeService.java index ae6a4cf8002fdf8972af81ab0e3b702bd312da19..997db44cf42ec1129c94c8ba23774b5ae9977974 100644 --- a/common/src/main/java/com/simon/service/DictTypeService.java +++ b/common/src/main/java/com/simon/service/DictTypeService.java @@ -1,6 +1,6 @@ package com.simon.service; -import com.simon.common.service.BasicService; +import com.simon.common.service.CrudService; import com.simon.dto.DictTypeDto; import com.simon.model.DictType; @@ -10,7 +10,7 @@ import java.util.List; * @author SimonSun * @date 2018-09-06 10:03:50 **/ -public interface DictTypeService extends BasicService { +public interface DictTypeService extends CrudService { /** * 根据字典组编码查询字典列表 * @param groupCode 字典组编码 diff --git a/common/src/main/java/com/simon/service/FontAwesomeService.java b/common/src/main/java/com/simon/service/FontAwesomeService.java index a474bb56edb0384e25a9b9a49daf878c8b4b013e..812ee795f24e7f5c88cafe80781db619f341c753 100644 --- a/common/src/main/java/com/simon/service/FontAwesomeService.java +++ b/common/src/main/java/com/simon/service/FontAwesomeService.java @@ -1,6 +1,6 @@ package com.simon.service; -import com.simon.common.service.BasicService; +import com.simon.common.service.CrudService; import com.simon.dto.FontAwesomeDto; import com.simon.model.FontAwesome; @@ -10,7 +10,7 @@ import java.util.List; * @author SimonSun * @date 2019-04-29 **/ -public interface FontAwesomeService extends BasicService { +public interface FontAwesomeService extends CrudService { /** * 获取Font Awesome字体dto列表 * @param language 语言 diff --git a/common/src/main/java/com/simon/service/LoggingEventService.java b/common/src/main/java/com/simon/service/LoggingEventService.java index c2355cd6a562e00924431cd2f46a2d113f3150d5..bc9dbbb75fbbe2bfadbed993683b282271ad4a2e 100644 --- a/common/src/main/java/com/simon/service/LoggingEventService.java +++ b/common/src/main/java/com/simon/service/LoggingEventService.java @@ -1,12 +1,12 @@ package com.simon.service; -import com.simon.common.service.BasicService; +import com.simon.common.service.CrudService; import com.simon.model.LoggingEvent; /** * @author SimonSun * @date 2018-11-09 **/ -public interface LoggingEventService extends BasicService { +public interface LoggingEventService extends CrudService { void deleteAll(); } \ No newline at end of file diff --git a/common/src/main/java/com/simon/service/NewsInfoService.java b/common/src/main/java/com/simon/service/NewsInfoService.java index 6b3ff5fbb4014687eeb58c8dd3632d676cd08786..3c46129b42aa72ae329244af6226b020d284134f 100644 --- a/common/src/main/java/com/simon/service/NewsInfoService.java +++ b/common/src/main/java/com/simon/service/NewsInfoService.java @@ -1,7 +1,7 @@ package com.simon.service; import com.github.pagehelper.PageInfo; -import com.simon.common.service.BasicService; +import com.simon.common.service.CrudService; import com.simon.model.NewsInfo; import java.util.Map; @@ -10,6 +10,6 @@ import java.util.Map; * @author SimonSun * @date 2019-01-20 **/ -public interface NewsInfoService extends BasicService { +public interface NewsInfoService extends CrudService { PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy); } \ No newline at end of file diff --git a/common/src/main/java/com/simon/service/NewsTagService.java b/common/src/main/java/com/simon/service/NewsTagService.java index f6f9948259f19368ed74a50afba331c584564d77..4f031e24e56da28bf973dc9d2387f14c0fc49d4a 100644 --- a/common/src/main/java/com/simon/service/NewsTagService.java +++ b/common/src/main/java/com/simon/service/NewsTagService.java @@ -1,12 +1,12 @@ package com.simon.service; -import com.simon.common.service.BasicService; +import com.simon.common.service.CrudService; import com.simon.model.NewsTag; /** * @author SimonSun * @create 2018-08-06 20:56:26 **/ -public interface NewsTagService extends BasicService { +public interface NewsTagService extends CrudService { } \ No newline at end of file diff --git a/common/src/main/java/com/simon/service/NoticeMsgService.java b/common/src/main/java/com/simon/service/NoticeMsgService.java index 51144a03512bc27aef6a77184f36ca5a5631269d..5a32d73b084f791b07893581464f864243c20db3 100644 --- a/common/src/main/java/com/simon/service/NoticeMsgService.java +++ b/common/src/main/java/com/simon/service/NoticeMsgService.java @@ -1,12 +1,12 @@ package com.simon.service; -import com.simon.common.service.BasicService; +import com.simon.common.service.CrudService; import com.simon.model.NoticeMsg; /** * @author SimonSun * @date 2018-11-24 **/ -public interface NoticeMsgService extends BasicService { +public interface NoticeMsgService extends CrudService { } \ No newline at end of file diff --git a/common/src/main/java/com/simon/service/OauthUserService.java b/common/src/main/java/com/simon/service/OauthUserService.java index 26f1c12cefb53208c3ed60967a8eddc95a4d7429..38f337fec91807d9fe5f77830f73bd9d6b68b9a8 100644 --- a/common/src/main/java/com/simon/service/OauthUserService.java +++ b/common/src/main/java/com/simon/service/OauthUserService.java @@ -1,7 +1,7 @@ package com.simon.service; import com.simon.common.domain.UserEntity; -import com.simon.common.service.BasicService; +import com.simon.common.service.CrudService; import com.simon.dto.AuthorityDto; import com.simon.model.OauthUser; @@ -14,7 +14,7 @@ import java.util.List; * @create 2018-07-31 19:55 **/ -public interface OauthUserService extends BasicService { +public interface OauthUserService extends CrudService { /** * 根据手机号查询用户 * @param phone 手机号 diff --git a/common/src/main/java/com/simon/service/ProvinceService.java b/common/src/main/java/com/simon/service/ProvinceService.java index 56175e5db99d40a85808f6dcbebf3d240ee3a13d..75c5adefd69a4989f76ed63b6fd4554d85535229 100644 --- a/common/src/main/java/com/simon/service/ProvinceService.java +++ b/common/src/main/java/com/simon/service/ProvinceService.java @@ -1,6 +1,6 @@ package com.simon.service; -import com.simon.common.service.BasicService; +import com.simon.common.service.CrudService; import com.simon.dto.vue.CascaderOptionDto; import com.simon.model.Province; @@ -10,7 +10,7 @@ import java.util.List; * @author SimonSun * @date 2019-04-24 **/ -public interface ProvinceService extends BasicService { +public interface ProvinceService extends CrudService { /** * Element UI Cascader级联选择器数据 * @return Cascader级联选择器数据 diff --git a/common/src/main/java/com/simon/service/QuartzJobService.java b/common/src/main/java/com/simon/service/QuartzJobService.java index e68186bad44ca3f1f39eda69b961c7c2a0f679ab..e251b27e7eb9fcc5668eb78841ae6af184a29a5d 100644 --- a/common/src/main/java/com/simon/service/QuartzJobService.java +++ b/common/src/main/java/com/simon/service/QuartzJobService.java @@ -1,6 +1,6 @@ package com.simon.service; -import com.simon.common.service.BasicService; +import com.simon.common.service.CrudService; import com.simon.model.QuartzJob; import org.quartz.SchedulerException; @@ -8,6 +8,6 @@ import org.quartz.SchedulerException; * @author SimonSun * @date 2018-12-21 **/ -public interface QuartzJobService extends BasicService { +public interface QuartzJobService extends CrudService { void runJobsOnStart() throws ClassNotFoundException, InstantiationException, SchedulerException, IllegalAccessException; } \ No newline at end of file diff --git a/common/src/main/java/com/simon/service/ResetPwdInfoService.java b/common/src/main/java/com/simon/service/ResetPwdInfoService.java index 04c2e549da267d8cad9aed47a03f1a91b58372ef..e8816d97cac67fc911988fd82d475b616f39bfcb 100644 --- a/common/src/main/java/com/simon/service/ResetPwdInfoService.java +++ b/common/src/main/java/com/simon/service/ResetPwdInfoService.java @@ -1,12 +1,12 @@ package com.simon.service; -import com.simon.common.service.BasicService; +import com.simon.common.service.CrudService; import com.simon.model.ResetPwdInfo; /** * @author SimonSun * @create 2018-08-06 20:56:26 **/ -public interface ResetPwdInfoService extends BasicService { +public interface ResetPwdInfoService extends CrudService { } \ No newline at end of file diff --git a/common/src/main/java/com/simon/service/SideMenuAuthorityService.java b/common/src/main/java/com/simon/service/SideMenuAuthorityService.java index d35aa09d5dc7d83b4282e756cf8f7ba9951b894a..5176a20d0e856119170f1915a3348a35568e37f4 100644 --- a/common/src/main/java/com/simon/service/SideMenuAuthorityService.java +++ b/common/src/main/java/com/simon/service/SideMenuAuthorityService.java @@ -1,6 +1,6 @@ package com.simon.service; -import com.simon.common.service.BasicService; +import com.simon.common.service.CrudService; import com.simon.model.SideMenuAuthority; import java.util.List; @@ -9,7 +9,7 @@ import java.util.List; * @author SimonSun * @date 2019-01-14 **/ -public interface SideMenuAuthorityService extends BasicService { +public interface SideMenuAuthorityService extends CrudService { /** * 更新角色权限（先删除再创建） * @param sideMenuIds 菜单id diff --git a/common/src/main/java/com/simon/service/SideMenuMultiLanguageService.java b/common/src/main/java/com/simon/service/SideMenuMultiLanguageService.java index 8b5652074fad3f5d800a4c0d230765db5414f6f2..93c46f95234ce2da115798762c05efc475fb35d5 100644 --- a/common/src/main/java/com/simon/service/SideMenuMultiLanguageService.java +++ b/common/src/main/java/com/simon/service/SideMenuMultiLanguageService.java @@ -1,15 +1,11 @@ package com.simon.service; import com.simon.model.SideMenuMultiLanguage; -import com.simon.common.service.BasicService; - -import java.time.LocalTime; -import java.time.LocalDate; -import java.time.LocalDateTime; +import com.simon.common.service.CrudService; /** * @author jeesun * @date 2019-05-30 **/ -public interface SideMenuMultiLanguageService extends BasicService { +public interface SideMenuMultiLanguageService extends CrudService { } \ No newline at end of file diff --git a/common/src/main/java/com/simon/service/SideMenuService.java b/common/src/main/java/com/simon/service/SideMenuService.java index 3ff0d78f0dcf442a48218b2d90059c4c0c8bca2e..1fc09aed0fb5e77ffa7aed0f9202848b522f5311 100644 --- a/common/src/main/java/com/simon/service/SideMenuService.java +++ b/common/src/main/java/com/simon/service/SideMenuService.java @@ -1,7 +1,7 @@ package com.simon.service; import com.github.pagehelper.PageInfo; -import com.simon.common.service.BasicService; +import com.simon.common.service.CrudService; import com.simon.dto.ButtonAuthorityDto; import com.simon.dto.EasyUiTreeDto; import com.simon.dto.SideMenuDto; @@ -14,7 +14,7 @@ import java.util.Map; * @author SimonSun * @date 2018-09-26 **/ -public interface SideMenuService extends BasicService { +public interface SideMenuService extends CrudService { PageInfo getAll(Map params, Integer limit, Integer offset); List getAll(String language); diff --git a/common/src/main/java/com/simon/service/TownService.java b/common/src/main/java/com/simon/service/TownService.java index 2ac77feeeaca64df05bed6f42a05b33924cfdcab..1f4226d3354307dd23211310736d436aae62b838 100644 --- a/common/src/main/java/com/simon/service/TownService.java +++ b/common/src/main/java/com/simon/service/TownService.java @@ -1,12 +1,12 @@ package com.simon.service; -import com.simon.common.service.BasicService; +import com.simon.common.service.CrudService; import com.simon.model.Town; /** * @author SimonSun * @date 2019-04-25 **/ -public interface TownService extends BasicService { +public interface TownService extends CrudService { } \ No newline at end of file diff --git a/common/src/main/java/com/simon/service/VillageService.java b/common/src/main/java/com/simon/service/VillageService.java index 3d31e1857c16d350db3cdade4671bfc970ba9293..48f549afe52750fac04be2e1c97171537fb038b0 100644 --- a/common/src/main/java/com/simon/service/VillageService.java +++ b/common/src/main/java/com/simon/service/VillageService.java @@ -1,12 +1,12 @@ package com.simon.service; -import com.simon.common.service.BasicService; +import com.simon.common.service.CrudService; import com.simon.model.Village; /** * @author SimonSun * @date 2019-04-24 **/ -public interface VillageService extends BasicService { +public interface VillageService extends CrudService { } \ No newline at end of file diff --git a/common/src/main/java/com/simon/service/impl/AccountBindServiceImpl.java b/common/src/main/java/com/simon/service/impl/AccountBindServiceImpl.java index 66985b3a33c77bb01ae01ec29c5bbf9053353a3a..d276c4b330c5d18d804235745784d7fae020c03c 100644 --- a/common/src/main/java/com/simon/service/impl/AccountBindServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/AccountBindServiceImpl.java @@ -1,138 +1,26 @@ package com.simon.service.impl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simon.common.config.AppConfig; +import com.simon.common.service.impl.CrudServiceImpl; import com.simon.mapper.AccountBindMapper; import com.simon.model.AccountBind; import com.simon.repository.AccountBindRepository; import com.simon.service.AccountBindService; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; -import java.util.Map; - /** * @author SimonSun * @date 2018-12-04 **/ @Service @Transactional(rollbackFor = {Exception.class}) -public class AccountBindServiceImpl implements AccountBindService { +public class AccountBindServiceImpl extends CrudServiceImpl implements AccountBindService { @Autowired private AccountBindMapper accountBindMapper; @Autowired private AccountBindRepository accountBindRepository; - @Override - public long count() { - return accountBindRepository.count(); - } - - @Override - public AccountBind save(AccountBind accountBind){ - return accountBindRepository.save(accountBind); - } - - @Override - public List save(List accountBindList) { - return accountBindRepository.save(accountBindList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy){ - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = accountBindMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return accountBindRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return accountBindRepository.findAll(); - } - - @Override - public void delete(Long id){ - accountBindRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return accountBindMapper.deleteByIds(ids); - } - - @Override - public AccountBind findById(Long id){ - return accountBindRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return accountBindMapper.insertList(list); - } - - @Override - public int insert(AccountBind accountBind){ - return accountBindMapper.insert(accountBind); - } - - @Override - public int insertSelective(AccountBind accountBind){ - return accountBindMapper.insertSelective(accountBind); - } - - @Override - public int updateByPrimaryKey(AccountBind accountBind){ - return accountBindMapper.updateByPrimaryKey(accountBind); - } - - @Override - public int updateByPrimaryKeySelective(AccountBind accountBind){ - return accountBindMapper.updateByPrimaryKeySelective(accountBind); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = accountBindMapper.getList(params); - return new PageInfo<>(list); - } - - @Override - public void batchSave(List list) { - - } - - @Override - public void batchUpdate(List list) { - - } } \ No newline at end of file diff --git a/common/src/main/java/com/simon/service/impl/AuthorityServiceImpl.java b/common/src/main/java/com/simon/service/impl/AuthorityServiceImpl.java index a55d1509f26fc25ce99c76c193a61ca6e4471af0..6bec0b0b7e003e7e3ded80457f6e47d39b063953 100644 --- a/common/src/main/java/com/simon/service/impl/AuthorityServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/AuthorityServiceImpl.java @@ -4,6 +4,7 @@ package com.simon.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.simon.common.config.AppConfig; +import com.simon.common.service.impl.CrudServiceImpl; import com.simon.dto.AuthorityDto; import com.simon.mapper.AuthorityMapper; import com.simon.model.Authority; @@ -12,14 +13,11 @@ import com.simon.service.AuthorityService; import lombok.var; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; -import java.util.Map; /** * @author SimonSun @@ -27,118 +25,13 @@ import java.util.Map; **/ @Service @Transactional(rollbackFor = {Exception.class}) -public class AuthorityServiceImpl implements AuthorityService { +public class AuthorityServiceImpl extends CrudServiceImpl implements AuthorityService { @Autowired private AuthorityMapper authorityMapper; @Autowired private AuthorityRepository authorityRepository; - @Override - public long count() { - return authorityRepository.count(); - } - - @Override - public Authority save(Authority authority) { - return authorityRepository.save(authority); - } - - @Override - public List save(List authorityList) { - return authorityRepository.save(authorityList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize) { - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)) { - PageHelper.startPage(pageNo, pageSize); - } else { - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = authorityMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable) { - return authorityRepository.findAll(pageable); - } - - @Override - public List findAll() { - return authorityRepository.findAll(); - } - - @Override - public void delete(Long id) { - authorityRepository.delete(id); - } - - @Override - public int deleteByIds(String ids) { - return authorityMapper.deleteByIds(ids); - } - - @Override - public Authority findById(Long id) { - return authorityRepository.findOne(id); - } - - @Override - public int insertList(List list) { - return authorityMapper.insertList(list); - } - - @Override - public int insert(Authority authority) { - return authorityMapper.insert(authority); - } - - @Override - public int insertSelective(Authority authority) { - return authorityMapper.insertSelective(authority); - } - - @Override - public int updateByPrimaryKey(Authority authority) { - return authorityMapper.updateByPrimaryKey(authority); - } - - @Override - public int updateByPrimaryKeySelective(Authority authority) { - return authorityMapper.updateByPrimaryKeySelective(authority); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize) { - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)) { - PageHelper.startPage(pageNo, pageSize); - } else { - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = authorityMapper.getList(params); - return new PageInfo<>(list); - } - - @Override - public void batchSave(List list) { - - } - - @Override - public void batchUpdate(List list) { - - } - @Override public PageInfo getDtoList(Long userId, String username, String authority, String language, Integer pageNo, Integer pageSize, String orderBy) { if (null == pageSize) { diff --git a/common/src/main/java/com/simon/service/impl/BillServiceImpl.java b/common/src/main/java/com/simon/service/impl/BillServiceImpl.java index f98bcd32f564623836ff9f8f084d41a0c5731279..6ce97f41508b5fe52458b164abf48fe3d9cb0344 100644 --- a/common/src/main/java/com/simon/service/impl/BillServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/BillServiceImpl.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.simon.common.config.AppConfig; import com.simon.common.domain.BillStatus; +import com.simon.common.service.impl.CrudServiceImpl; import com.simon.common.utils.BeanUtils; import com.simon.common.utils.snowflake.SnowFlakeId; import com.simon.mapper.BillMapper; @@ -15,8 +16,6 @@ import com.simon.request.BillRequest; import com.simon.service.BillService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -30,118 +29,13 @@ import java.util.Map; **/ @Service @Transactional(rollbackFor = {Exception.class}) -public class BillServiceImpl implements BillService { +public class BillServiceImpl extends CrudServiceImpl implements BillService { @Autowired private BillMapper billMapper; @Autowired private BillRepository billRepository; - @Override - public long count() { - return billRepository.count(); - } - - @Override - public Bill save(Bill bill){ - return billRepository.save(bill); - } - - @Override - public List save(List billList) { - return billRepository.save(billList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy){ - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = billMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return billRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return billRepository.findAll(); - } - - @Override - public void delete(Long id){ - billRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return billMapper.deleteByIds(ids); - } - - @Override - public Bill findById(Long id){ - return billRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return billMapper.insertList(list); - } - - @Override - public int insert(Bill bill){ - return billMapper.insert(bill); - } - - @Override - public int insertSelective(Bill bill){ - return billMapper.insertSelective(bill); - } - - @Override - public int updateByPrimaryKey(Bill bill){ - return billMapper.updateByPrimaryKey(bill); - } - - @Override - public int updateByPrimaryKeySelective(Bill bill){ - return billMapper.updateByPrimaryKeySelective(bill); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = billMapper.getList(params); - return new PageInfo<>(list); - } - - @Override - public void batchSave(List list) { - - } - - @Override - public void batchUpdate(List list) { - - } - @Override public Bill createBill(BillRequest billRequest) { Bill bill = new Bill(); diff --git a/common/src/main/java/com/simon/service/impl/CityServiceImpl.java b/common/src/main/java/com/simon/service/impl/CityServiceImpl.java index 1d2d8e4224d4bef263cf1c00a290269380d51a67..00daab597e8b7c30be4785bc4ad25bcfba4ca08d 100644 --- a/common/src/main/java/com/simon/service/impl/CityServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/CityServiceImpl.java @@ -1,25 +1,18 @@ package com.simon.service.impl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simon.common.config.AppConfig; +import com.simon.common.service.impl.CrudServiceImpl; import com.simon.dto.vue.CascaderOptionDto; import com.simon.mapper.CityMapper; import com.simon.model.City; -import com.simon.repository.CityRepository; import com.simon.service.CityService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; -import java.util.Map; /** * @author SimonSun @@ -28,118 +21,10 @@ import java.util.Map; @Slf4j @Service @Transactional(rollbackFor = {Exception.class}) -public class CityServiceImpl implements CityService { +public class CityServiceImpl extends CrudServiceImpl implements CityService { @Autowired private CityMapper cityMapper; - @Autowired - private CityRepository cityRepository; - - @Override - public long count() { - return cityRepository.count(); - } - - @Override - public City save(City city){ - return cityRepository.save(city); - } - - @Override - public List save(List cityList) { - return cityRepository.save(cityList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy){ - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = cityMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return cityRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return cityRepository.findAll(); - } - - @Override - public void delete(Integer id){ - cityRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return cityMapper.deleteByIds(ids); - } - - @Override - public City findById(Integer id){ - return cityRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return cityMapper.insertList(list); - } - - @Override - public int insert(City city){ - return cityMapper.insert(city); - } - - @Override - public int insertSelective(City city){ - return cityMapper.insertSelective(city); - } - - @Override - public int updateByPrimaryKey(City city){ - return cityMapper.updateByPrimaryKey(city); - } - - @Override - public int updateByPrimaryKeySelective(City city){ - return cityMapper.updateByPrimaryKeySelective(city); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = cityMapper.getList(params); - return new PageInfo<>(list); - } - - @Override - public void batchSave(List list) { - - } - - @Override - public void batchUpdate(List list) { - - } - @Override public List findByProvinceId(String provinceId) { return cityMapper.findByProvinceId(provinceId); diff --git a/common/src/main/java/com/simon/service/impl/ColumnUiServiceImpl.java b/common/src/main/java/com/simon/service/impl/ColumnUiServiceImpl.java index fe9a4955b9f763bd5106efad9f7487f7e758d440..4e4e58201a3797c372fea55c289a5f2345e74676 100644 --- a/common/src/main/java/com/simon/service/impl/ColumnUiServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/ColumnUiServiceImpl.java @@ -1,23 +1,17 @@ package com.simon.service.impl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simon.common.config.AppConfig; +import com.simon.common.service.impl.CrudServiceImpl; import com.simon.mapper.ColumnUiMapper; import com.simon.model.ColumnUi; import com.simon.repository.ColumnUiRepository; import com.simon.service.ColumnUiService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; -import java.util.Map; /** * @author SimonSun @@ -26,118 +20,13 @@ import java.util.Map; @Slf4j @Service @Transactional(rollbackFor = {Exception.class}) -public class ColumnUiServiceImpl implements ColumnUiService { +public class ColumnUiServiceImpl extends CrudServiceImpl implements ColumnUiService { @Autowired private ColumnUiMapper columnUiMapper; @Autowired private ColumnUiRepository columnUiRepository; - @Override - public long count() { - return columnUiRepository.count(); - } - - @Override - public ColumnUi save(ColumnUi columnUi){ - return columnUiRepository.save(columnUi); - } - - @Override - public List save(List columnUiList) { - return columnUiRepository.save(columnUiList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy){ - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = columnUiMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return columnUiRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return columnUiRepository.findAll(); - } - - @Override - public void delete(Long id){ - columnUiRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return columnUiMapper.deleteByIds(ids); - } - - @Override - public ColumnUi findById(Long id){ - return columnUiRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return columnUiMapper.insertList(list); - } - - @Override - public int insert(ColumnUi columnUi){ - return columnUiMapper.insert(columnUi); - } - - @Override - public int insertSelective(ColumnUi columnUi){ - return columnUiMapper.insertSelective(columnUi); - } - - @Override - public int updateByPrimaryKey(ColumnUi columnUi){ - return columnUiMapper.updateByPrimaryKey(columnUi); - } - - @Override - public int updateByPrimaryKeySelective(ColumnUi columnUi){ - return columnUiMapper.updateByPrimaryKeySelective(columnUi); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = columnUiMapper.getList(params); - return new PageInfo<>(list); - } - - @Override - public void batchSave(List list) { - - } - - @Override - public void batchUpdate(List list) { - - } - @Override public List findByTableName(String tableName) { return columnUiRepository.findByTableName(tableName); diff --git a/common/src/main/java/com/simon/service/impl/CountryServiceImpl.java b/common/src/main/java/com/simon/service/impl/CountryServiceImpl.java index 67c03b889040ee0174ad2f591a43b0230e7ffb3c..7abe52f5ced01ddbd8f11e70a09cedfc91ad468f 100644 --- a/common/src/main/java/com/simon/service/impl/CountryServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/CountryServiceImpl.java @@ -1,25 +1,19 @@ package com.simon.service.impl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simon.common.config.AppConfig; +import com.simon.common.service.impl.CrudServiceImpl; import com.simon.dto.vue.CascaderOptionDto; import com.simon.mapper.CountryMapper; import com.simon.model.Country; import com.simon.repository.CountryRepository; import com.simon.service.CountryService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; -import java.util.Map; /** * @author SimonSun @@ -28,118 +22,13 @@ import java.util.Map; @Slf4j @Service @Transactional(rollbackFor = {Exception.class}) -public class CountryServiceImpl implements CountryService { +public class CountryServiceImpl extends CrudServiceImpl implements CountryService { @Autowired private CountryMapper countryMapper; @Autowired private CountryRepository countryRepository; - @Override - public long count() { - return countryRepository.count(); - } - - @Override - public Country save(Country country){ - return countryRepository.save(country); - } - - @Override - public List save(List countryList) { - return countryRepository.save(countryList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy){ - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = countryMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return countryRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return countryRepository.findAll(); - } - - @Override - public void delete(Integer id){ - countryRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return countryMapper.deleteByIds(ids); - } - - @Override - public Country findById(Integer id){ - return countryRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return countryMapper.insertList(list); - } - - @Override - public int insert(Country country){ - return countryMapper.insert(country); - } - - @Override - public int insertSelective(Country country){ - return countryMapper.insertSelective(country); - } - - @Override - public int updateByPrimaryKey(Country country){ - return countryMapper.updateByPrimaryKey(country); - } - - @Override - public int updateByPrimaryKeySelective(Country country){ - return countryMapper.updateByPrimaryKeySelective(country); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = countryMapper.getList(params); - return new PageInfo<>(list); - } - - @Override - public void batchSave(List list) { - - } - - @Override - public void batchUpdate(List list) { - - } - @Override public List findByCityId(String cityId) { return countryMapper.findByCityId(cityId); diff --git a/common/src/main/java/com/simon/service/impl/DictTypeGroupMultiLanguageServiceImpl.java b/common/src/main/java/com/simon/service/impl/DictTypeGroupMultiLanguageServiceImpl.java index 21bd709c1852a71d1a754b4dca31ceb94352a7fe..7a621e042084a10d14a848a4b1de283905f47ad0 100644 --- a/common/src/main/java/com/simon/service/impl/DictTypeGroupMultiLanguageServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/DictTypeGroupMultiLanguageServiceImpl.java @@ -1,24 +1,16 @@ package com.simon.service.impl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simon.common.config.AppConfig; +import com.simon.common.service.impl.CrudServiceImpl; import com.simon.mapper.DictTypeGroupMultiLanguageMapper; import com.simon.model.DictTypeGroupMultiLanguage; import com.simon.repository.DictTypeGroupMultiLanguageRepository; import com.simon.service.DictTypeGroupMultiLanguageService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; -import java.util.Map; - /** * @author jeesun * @date 2019-06-03 @@ -26,115 +18,11 @@ import java.util.Map; @Slf4j @Service @Transactional(rollbackFor = {Exception.class}) -public class DictTypeGroupMultiLanguageServiceImpl implements DictTypeGroupMultiLanguageService { +public class DictTypeGroupMultiLanguageServiceImpl extends CrudServiceImpl implements DictTypeGroupMultiLanguageService { @Autowired private DictTypeGroupMultiLanguageMapper dictTypeGroupMultiLanguageMapper; @Autowired private DictTypeGroupMultiLanguageRepository dictTypeGroupMultiLanguageRepository; - @Override - public long count() { - return dictTypeGroupMultiLanguageRepository.count(); - } - - @Override - public DictTypeGroupMultiLanguage save(DictTypeGroupMultiLanguage dictTypeGroupMultiLanguage){ - return dictTypeGroupMultiLanguageRepository.save(dictTypeGroupMultiLanguage); - } - - @Override - public List save(List dictTypeGroupMultiLanguageList) { - return dictTypeGroupMultiLanguageRepository.save(dictTypeGroupMultiLanguageList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy){ - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = dictTypeGroupMultiLanguageMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return dictTypeGroupMultiLanguageRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return dictTypeGroupMultiLanguageRepository.findAll(); - } - - @Override - public void delete(Long id){ - dictTypeGroupMultiLanguageRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return dictTypeGroupMultiLanguageMapper.deleteByIds(ids); - } - - @Override - public DictTypeGroupMultiLanguage findById(Long id){ - return dictTypeGroupMultiLanguageRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return dictTypeGroupMultiLanguageMapper.insertList(list); - } - - @Override - public int insert(DictTypeGroupMultiLanguage dictTypeGroupMultiLanguage){ - return dictTypeGroupMultiLanguageMapper.insert(dictTypeGroupMultiLanguage); - } - - @Override - public int insertSelective(DictTypeGroupMultiLanguage dictTypeGroupMultiLanguage){ - return dictTypeGroupMultiLanguageMapper.insertSelective(dictTypeGroupMultiLanguage); - } - - @Override - public int updateByPrimaryKey(DictTypeGroupMultiLanguage dictTypeGroupMultiLanguage){ - return dictTypeGroupMultiLanguageMapper.updateByPrimaryKey(dictTypeGroupMultiLanguage); - } - - @Override - public int updateByPrimaryKeySelective(DictTypeGroupMultiLanguage dictTypeGroupMultiLanguage){ - return dictTypeGroupMultiLanguageMapper.updateByPrimaryKeySelective(dictTypeGroupMultiLanguage); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = dictTypeGroupMultiLanguageMapper.getList(params); - return new PageInfo<>(list); - } - - @Override - public void batchSave(List list) { - - } - - @Override - public void batchUpdate(List list) { - - } } \ No newline at end of file diff --git a/common/src/main/java/com/simon/service/impl/DictTypeGroupServiceImpl.java b/common/src/main/java/com/simon/service/impl/DictTypeGroupServiceImpl.java index 6263adfe71542f030146ec567a4e07e9a0022632..48d0ee27083ae698daa09fc9838d09e97fa00a04 100644 --- a/common/src/main/java/com/simon/service/impl/DictTypeGroupServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/DictTypeGroupServiceImpl.java @@ -4,6 +4,7 @@ package com.simon.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.simon.common.config.AppConfig; +import com.simon.common.service.impl.CrudServiceImpl; import com.simon.dto.DictTypeDto; import com.simon.dto.EasyUiTreeGridDto; import com.simon.dto.SelectDto; @@ -15,18 +16,14 @@ import com.simon.model.DictTypeGroupMultiLanguage; import com.simon.repository.DictTypeGroupMultiLanguageRepository; import com.simon.repository.DictTypeGroupRepository; import com.simon.service.DictTypeGroupService; -import lombok.var; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; -import java.util.Map; /** * @author SimonSun @@ -34,7 +31,7 @@ import java.util.Map; **/ @Service @Transactional(rollbackFor = {Exception.class}) -public class DictTypeGroupServiceImpl implements DictTypeGroupService { +public class DictTypeGroupServiceImpl extends CrudServiceImpl implements DictTypeGroupService { @Autowired private DictTypeGroupMapper dictTypeGroupMapper; @@ -47,112 +44,6 @@ public class DictTypeGroupServiceImpl implements DictTypeGroupService { @Autowired private DictTypeGroupMultiLanguageRepository dictTypeGroupMultiLanguageRepository; - @Override - public long count() { - return dictTypeGroupRepository.count(); - } - - @Override - public DictTypeGroup save(DictTypeGroup dictTypeGroup) { - return dictTypeGroupRepository.save(dictTypeGroup); - } - - @Override - public List save(List dictTypeGroupList) { - return dictTypeGroupRepository.save(dictTypeGroupList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize) { - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)) { - PageHelper.startPage(pageNo, pageSize); - } else { - PageHelper.startPage(pageNo, pageSize, orderBy); - } - - List list = dictTypeGroupMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable) { - return dictTypeGroupRepository.findAll(pageable); - } - - @Override - public List findAll() { - return dictTypeGroupRepository.findAll(); - } - - @Override - public void delete(Long id) { - dictTypeGroupMapper.deleteByPrimaryKey(id); - } - - @Override - public int deleteByIds(String ids) { - return dictTypeGroupMapper.deleteByIds(ids); - } - - @Override - public DictTypeGroup findById(Long id) { - return dictTypeGroupRepository.findOne(id); - } - - @Override - public int insertList(List list) { - return dictTypeGroupMapper.insertList(list); - } - - @Override - public int insert(DictTypeGroup dictTypeGroup) { - return dictTypeGroupMapper.insert(dictTypeGroup); - } - - @Override - public int insertSelective(DictTypeGroup dictTypeGroup) { - return dictTypeGroupMapper.insertSelective(dictTypeGroup); - } - - @Override - public int updateByPrimaryKey(DictTypeGroup dictTypeGroup) { - return dictTypeGroupMapper.updateByPrimaryKey(dictTypeGroup); - } - - @Override - public int updateByPrimaryKeySelective(DictTypeGroup dictTypeGroup) { - return dictTypeGroupMapper.updateByPrimaryKeySelective(dictTypeGroup); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize) { - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)) { - PageHelper.startPage(pageNo, pageSize); - } else { - PageHelper.startPage(pageNo, pageSize, orderBy); - } - var list = dictTypeGroupMapper.getList(params); - return new PageInfo<>(list); - } - - @Override - public void batchSave(List list) { - - } - - @Override - public void batchUpdate(List list) { - - } - @Override public List getDtos(String language, Integer limit, Integer offset) { List dtoList = new ArrayList<>(); diff --git a/common/src/main/java/com/simon/service/impl/DictTypeMultiLanguageServiceImpl.java b/common/src/main/java/com/simon/service/impl/DictTypeMultiLanguageServiceImpl.java index 163f04078af49a82436677d77957e720b6697965..1afeae59477742eca1be3c2a43c066e589130388 100644 --- a/common/src/main/java/com/simon/service/impl/DictTypeMultiLanguageServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/DictTypeMultiLanguageServiceImpl.java @@ -1,28 +1,15 @@ package com.simon.service.impl; +import com.simon.common.service.impl.CrudServiceImpl; import com.simon.mapper.DictTypeMultiLanguageMapper; import com.simon.model.DictTypeMultiLanguage; -import com.simon.service.DictTypeMultiLanguageService; import com.simon.repository.DictTypeMultiLanguageRepository; -import com.simon.common.config.AppConfig; +import com.simon.service.DictTypeMultiLanguageService; import lombok.extern.slf4j.Slf4j; -import lombok.var; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; -import org.apache.commons.lang3.StringUtils; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; -import java.time.LocalTime; -import java.time.LocalDate; -import java.time.LocalDateTime; /** * @author jeesun @@ -31,115 +18,11 @@ import java.time.LocalDateTime; @Slf4j @Service @Transactional(rollbackFor = {Exception.class}) -public class DictTypeMultiLanguageServiceImpl implements DictTypeMultiLanguageService { +public class DictTypeMultiLanguageServiceImpl extends CrudServiceImpl implements DictTypeMultiLanguageService { @Autowired private DictTypeMultiLanguageMapper dictTypeMultiLanguageMapper; @Autowired private DictTypeMultiLanguageRepository dictTypeMultiLanguageRepository; - @Override - public long count() { - return dictTypeMultiLanguageRepository.count(); - } - - @Override - public DictTypeMultiLanguage save(DictTypeMultiLanguage dictTypeMultiLanguage){ - return dictTypeMultiLanguageRepository.save(dictTypeMultiLanguage); - } - - @Override - public List save(List dictTypeMultiLanguageList) { - return dictTypeMultiLanguageRepository.save(dictTypeMultiLanguageList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy){ - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = dictTypeMultiLanguageMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return dictTypeMultiLanguageRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return dictTypeMultiLanguageRepository.findAll(); - } - - @Override - public void delete(Long id){ - dictTypeMultiLanguageRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return dictTypeMultiLanguageMapper.deleteByIds(ids); - } - - @Override - public DictTypeMultiLanguage findById(Long id){ - return dictTypeMultiLanguageRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return dictTypeMultiLanguageMapper.insertList(list); - } - - @Override - public int insert(DictTypeMultiLanguage dictTypeMultiLanguage){ - return dictTypeMultiLanguageMapper.insert(dictTypeMultiLanguage); - } - - @Override - public int insertSelective(DictTypeMultiLanguage dictTypeMultiLanguage){ - return dictTypeMultiLanguageMapper.insertSelective(dictTypeMultiLanguage); - } - - @Override - public int updateByPrimaryKey(DictTypeMultiLanguage dictTypeMultiLanguage){ - return dictTypeMultiLanguageMapper.updateByPrimaryKey(dictTypeMultiLanguage); - } - - @Override - public int updateByPrimaryKeySelective(DictTypeMultiLanguage dictTypeMultiLanguage){ - return dictTypeMultiLanguageMapper.updateByPrimaryKeySelective(dictTypeMultiLanguage); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = dictTypeMultiLanguageMapper.getList(params); - return new PageInfo<>(list); - } - - @Override - public void batchSave(List list) { - - } - - @Override - public void batchUpdate(List list) { - - } } \ No newline at end of file diff --git a/common/src/main/java/com/simon/service/impl/DictTypeServiceImpl.java b/common/src/main/java/com/simon/service/impl/DictTypeServiceImpl.java index 5c900742b708fbf9e3d7df95c740b0d939ed3cae..b73ce761b64a8744dcdd872cc36df74b84cc24b9 100644 --- a/common/src/main/java/com/simon/service/impl/DictTypeServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/DictTypeServiceImpl.java @@ -1,9 +1,7 @@ package com.simon.service.impl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simon.common.config.AppConfig; +import com.simon.common.service.impl.CrudServiceImpl; import com.simon.dto.DictTypeDto; import com.simon.mapper.DictTypeMapper; import com.simon.mapper.DictTypeMultiLanguageMapper; @@ -13,17 +11,13 @@ import com.simon.repository.DictTypeGroupRepository; import com.simon.repository.DictTypeMultiLanguageRepository; import com.simon.repository.DictTypeRepository; import com.simon.service.DictTypeService; -import lombok.var; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.List; -import java.util.Map; /** * @author SimonSun @@ -31,7 +25,7 @@ import java.util.Map; **/ @Service @Transactional(rollbackFor = {Exception.class}) -public class DictTypeServiceImpl implements DictTypeService { +public class DictTypeServiceImpl extends CrudServiceImpl implements DictTypeService { @Autowired private DictTypeMapper dictTypeMapper; @@ -47,111 +41,6 @@ public class DictTypeServiceImpl implements DictTypeService { @Autowired private DictTypeMultiLanguageRepository dictTypeMultiLanguageRepository; - @Override - public long count() { - return dictTypeRepository.count(); - } - - @Override - public DictType save(DictType dictType){ - return dictTypeRepository.save(dictType); - } - - @Override - public List save(List dictTypeList) { - return dictTypeRepository.save(dictTypeList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = dictTypeMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return dictTypeRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return dictTypeRepository.findAll(); - } - - @Override - public void delete(Long id){ - dictTypeRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return dictTypeMapper.deleteByIds(ids); - } - - @Override - public DictType findById(Long id){ - return dictTypeRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return dictTypeMapper.insertList(list); - } - - @Override - public int insert(DictType dictType){ - return dictTypeMapper.insert(dictType); - } - - @Override - public int insertSelective(DictType dictType){ - return dictTypeMapper.insertSelective(dictType); - } - - @Override - public int updateByPrimaryKey(DictType dictType){ - return dictTypeMapper.updateByPrimaryKey(dictType); - } - - @Override - public int updateByPrimaryKeySelective(DictType dictType){ - return dictTypeMapper.updateByPrimaryKeySelective(dictType); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - var list = dictTypeMapper.getList(params); - return new PageInfo<>(list); - } - - @Override - public void batchSave(List list) { - - } - - @Override - public void batchUpdate(List list) { - - } - @Override public List getTypeByGroupCode(String groupCode, String language) { return dictTypeMapper.getByGroupCode(groupCode, language); diff --git a/common/src/main/java/com/simon/service/impl/FontAwesomeServiceImpl.java b/common/src/main/java/com/simon/service/impl/FontAwesomeServiceImpl.java index 2d1bc0659911327c67432cb981149007cf782956..fcd510e033fc68ef14ba1e67c091ecab27d60a9f 100644 --- a/common/src/main/java/com/simon/service/impl/FontAwesomeServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/FontAwesomeServiceImpl.java @@ -1,24 +1,18 @@ package com.simon.service.impl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simon.common.config.AppConfig; +import com.simon.common.service.impl.CrudServiceImpl; import com.simon.dto.FontAwesomeDto; import com.simon.mapper.FontAwesomeMapper; import com.simon.model.FontAwesome; import com.simon.repository.FontAwesomeRepository; import com.simon.service.FontAwesomeService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; -import java.util.Map; /** * @author SimonSun @@ -27,120 +21,13 @@ import java.util.Map; @Slf4j @Service @Transactional(rollbackFor = {Exception.class}) -public class FontAwesomeServiceImpl implements FontAwesomeService { +public class FontAwesomeServiceImpl extends CrudServiceImpl implements FontAwesomeService { @Autowired private FontAwesomeMapper fontAwesomeMapper; @Autowired private FontAwesomeRepository fontAwesomeRepository; - @Override - public long count() { - return fontAwesomeRepository.count(); - } - - @Override - public FontAwesome save(FontAwesome fontAwesome){ - return fontAwesomeRepository.save(fontAwesome); - } - - @Override - public List save(List fontAwesomeList) { - return fontAwesomeRepository.save(fontAwesomeList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy){ - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = fontAwesomeMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return fontAwesomeRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return fontAwesomeRepository.findAll(); - } - - @Override - public void delete(Integer id){ - fontAwesomeRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return fontAwesomeMapper.deleteByIds(ids); - } - - @Override - public FontAwesome findById(Integer id){ - return fontAwesomeRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return fontAwesomeMapper.insertList(list); - } - - @Override - public int insert(FontAwesome fontAwesome){ - return fontAwesomeMapper.insert(fontAwesome); - } - - @Override - public int insertSelective(FontAwesome fontAwesome){ - return fontAwesomeMapper.insertSelective(fontAwesome); - } - - @Override - public int updateByPrimaryKey(FontAwesome fontAwesome){ - return fontAwesomeMapper.updateByPrimaryKey(fontAwesome); - } - - @Override - public int updateByPrimaryKeySelective(FontAwesome fontAwesome){ - return fontAwesomeMapper.updateByPrimaryKeySelective(fontAwesome); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - Object labelEnUs = params.getOrDefault("labelEnUs", ""); - Object labelZhCn = params.getOrDefault("labelZhCn", ""); - List list = fontAwesomeMapper.getList(null == labelEnUs ? "" : labelEnUs.toString(), null == labelZhCn ? "" : labelZhCn.toString()); - return new PageInfo<>(list); - } - - @Override - public void batchSave(List list) { - - } - - @Override - public void batchUpdate(List list) { - - } - @Override public List getDtos(String language) { return fontAwesomeMapper.getDtos(language); diff --git a/common/src/main/java/com/simon/service/impl/NewsInfoServiceImpl.java b/common/src/main/java/com/simon/service/impl/NewsInfoServiceImpl.java index 7053fcad8500cd7a0ee8810448d7dc5521f6860d..478e9c95e59d20ded6e3177485e7a827bbcf98f7 100644 --- a/common/src/main/java/com/simon/service/impl/NewsInfoServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/NewsInfoServiceImpl.java @@ -1,24 +1,16 @@ package com.simon.service.impl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simon.common.config.AppConfig; +import com.simon.common.service.impl.CrudServiceImpl; import com.simon.mapper.NewsInfoMapper; import com.simon.model.NewsInfo; import com.simon.repository.NewsInfoRepository; import com.simon.service.NewsInfoService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; -import java.util.Map; - /** * @author SimonSun * @date 2019-01-20 @@ -26,115 +18,11 @@ import java.util.Map; @Slf4j @Service @Transactional(rollbackFor = {Exception.class}) -public class NewsInfoServiceImpl implements NewsInfoService { +public class NewsInfoServiceImpl extends CrudServiceImpl implements NewsInfoService { @Autowired private NewsInfoMapper newsInfoMapper; @Autowired private NewsInfoRepository newsInfoRepository; - @Override - public long count() { - return newsInfoRepository.count(); - } - - @Override - public NewsInfo save(NewsInfo newsInfo){ - return newsInfoRepository.save(newsInfo); - } - - @Override - public List save(List newsInfoList) { - return newsInfoRepository.save(newsInfoList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy){ - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = newsInfoMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return newsInfoRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return newsInfoRepository.findAll(); - } - - @Override - public void delete(Long id){ - newsInfoRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return newsInfoMapper.deleteByIds(ids); - } - - @Override - public NewsInfo findById(Long id){ - return newsInfoRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return newsInfoMapper.insertList(list); - } - - @Override - public int insert(NewsInfo newsInfo){ - return newsInfoMapper.insert(newsInfo); - } - - @Override - public int insertSelective(NewsInfo newsInfo){ - return newsInfoMapper.insertSelective(newsInfo); - } - - @Override - public int updateByPrimaryKey(NewsInfo newsInfo){ - return newsInfoMapper.updateByPrimaryKey(newsInfo); - } - - @Override - public int updateByPrimaryKeySelective(NewsInfo newsInfo){ - return newsInfoMapper.updateByPrimaryKeySelective(newsInfo); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = newsInfoMapper.getList(params); - return new PageInfo<>(list); - } - - @Override - public void batchSave(List list) { - - } - - @Override - public void batchUpdate(List list) { - - } } \ No newline at end of file diff --git a/common/src/main/java/com/simon/service/impl/NewsTagServiceImpl.java b/common/src/main/java/com/simon/service/impl/NewsTagServiceImpl.java index dea073ed41f96815e0fdded36e49617f9d8b5e6b..b0e29469f6ac2e492388448b8629021630e66510 100644 --- a/common/src/main/java/com/simon/service/impl/NewsTagServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/NewsTagServiceImpl.java @@ -4,6 +4,7 @@ package com.simon.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.simon.common.config.AppConfig; +import com.simon.common.service.impl.CrudServiceImpl; import com.simon.mapper.NewsTagMapper; import com.simon.model.NewsTag; import com.simon.repository.NewsTagRepository; @@ -25,115 +26,11 @@ import java.util.Map; **/ @Service @Transactional(rollbackFor = {Exception.class}) -public class NewsTagServiceImpl implements NewsTagService { +public class NewsTagServiceImpl extends CrudServiceImpl implements NewsTagService { @Autowired private NewsTagMapper newsTagMapper; @Autowired private NewsTagRepository newsTagRepository; - @Override - public long count() { - return newsTagRepository.count(); - } - - @Override - public NewsTag save(NewsTag newsTag){ - return newsTagRepository.save(newsTag); - } - - @Override - public List save(List newsTagList) { - return newsTagRepository.save(newsTagList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = newsTagMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return newsTagRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return newsTagRepository.findAll(); - } - - @Override - public void delete(Long id){ - newsTagRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return newsTagMapper.deleteByIds(ids); - } - - @Override - public NewsTag findById(Long id){ - return newsTagRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return newsTagMapper.insertList(list); - } - - @Override - public int insert(NewsTag newsTag){ - return newsTagMapper.insert(newsTag); - } - - @Override - public int insertSelective(NewsTag newsTag){ - return newsTagMapper.insertSelective(newsTag); - } - - @Override - public int updateByPrimaryKey(NewsTag newsTag) { - return newsTagMapper.updateByPrimaryKey(newsTag); - } - - @Override - public int updateByPrimaryKeySelective(NewsTag newsTag) { - return newsTagMapper.updateByPrimaryKeySelective(newsTag); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - var list = newsTagMapper.getList(params); - return new PageInfo<>(list); - } - - @Override - public void batchSave(List list) { - - } - - @Override - public void batchUpdate(List list) { - - } } \ No newline at end of file diff --git a/common/src/main/java/com/simon/service/impl/NoticeMsgServiceImpl.java b/common/src/main/java/com/simon/service/impl/NoticeMsgServiceImpl.java index df9df968d49460852f2a6ec3aad45a616e875fb7..d7803dbc60565efc6a4fa50983ec9456dfeb2496 100644 --- a/common/src/main/java/com/simon/service/impl/NoticeMsgServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/NoticeMsgServiceImpl.java @@ -4,6 +4,7 @@ package com.simon.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.simon.common.config.AppConfig; +import com.simon.common.service.impl.CrudServiceImpl; import com.simon.mapper.NoticeMsgMapper; import com.simon.model.NoticeMsg; import com.simon.repository.NoticeMsgRepository; @@ -25,115 +26,10 @@ import java.util.Map; **/ @Service @Transactional(rollbackFor = {Exception.class}) -public class NoticeMsgServiceImpl implements NoticeMsgService { +public class NoticeMsgServiceImpl extends CrudServiceImpl implements NoticeMsgService { @Autowired private NoticeMsgMapper noticeMsgMapper; @Autowired private NoticeMsgRepository noticeMsgRepository; - - @Override - public long count() { - return noticeMsgRepository.count(); - } - - @Override - public NoticeMsg save(NoticeMsg noticeMsg){ - return noticeMsgRepository.save(noticeMsg); - } - - @Override - public List save(List noticeMsgList) { - return noticeMsgRepository.save(noticeMsgList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy){ - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = noticeMsgMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return noticeMsgRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return noticeMsgRepository.findAll(); - } - - @Override - public void delete(Long id){ - noticeMsgRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return noticeMsgMapper.deleteByIds(ids); - } - - @Override - public NoticeMsg findById(Long id){ - return noticeMsgRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return noticeMsgMapper.insertList(list); - } - - @Override - public int insert(NoticeMsg noticeMsg){ - return noticeMsgMapper.insert(noticeMsg); - } - - @Override - public int insertSelective(NoticeMsg noticeMsg){ - return noticeMsgMapper.insertSelective(noticeMsg); - } - - @Override - public int updateByPrimaryKey(NoticeMsg noticeMsg){ - return noticeMsgMapper.updateByPrimaryKey(noticeMsg); - } - - @Override - public int updateByPrimaryKeySelective(NoticeMsg noticeMsg){ - return noticeMsgMapper.updateByPrimaryKeySelective(noticeMsg); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - var list = noticeMsgMapper.getList(params); - return new PageInfo<>(list); - } - - @Override - public void batchSave(List list) { - - } - - @Override - public void batchUpdate(List list) { - - } } \ No newline at end of file diff --git a/common/src/main/java/com/simon/service/impl/OauthUserServiceImpl.java b/common/src/main/java/com/simon/service/impl/OauthUserServiceImpl.java index 73ceb08d483b115b9b18a1291e1705d78d99ae69..5d5472bcd6646b92de0721a724f5d6d5098061b0 100644 --- a/common/src/main/java/com/simon/service/impl/OauthUserServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/OauthUserServiceImpl.java @@ -8,6 +8,7 @@ import com.simon.common.exception.BusinessException; import com.simon.common.exception.PhoneRegisteredException; import com.simon.common.exception.UserExistsException; import com.simon.common.factory.SmsServiceFactory; +import com.simon.common.service.impl.CrudServiceImpl; import com.simon.common.utils.BeanUtils; import com.simon.common.utils.UsernameUtil; import com.simon.dto.AuthorityDto; diff --git a/common/src/main/java/com/simon/service/impl/ProvinceServiceImpl.java b/common/src/main/java/com/simon/service/impl/ProvinceServiceImpl.java index 807f460f2550990b595c07f6dd74c532c827705b..9f87208ca06fe57161aaacaaaa7c76735a760a42 100644 --- a/common/src/main/java/com/simon/service/impl/ProvinceServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/ProvinceServiceImpl.java @@ -4,6 +4,7 @@ package com.simon.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.simon.common.config.AppConfig; +import com.simon.common.service.impl.CrudServiceImpl; import com.simon.dto.vue.CascaderOptionDto; import com.simon.mapper.ProvinceMapper; import com.simon.model.Province; @@ -28,118 +29,13 @@ import java.util.Map; @Slf4j @Service @Transactional(rollbackFor = {Exception.class}) -public class ProvinceServiceImpl implements ProvinceService { +public class ProvinceServiceImpl extends CrudServiceImpl implements ProvinceService { @Autowired private ProvinceMapper provinceMapper; @Autowired private ProvinceRepository provinceRepository; - @Override - public long count() { - return provinceRepository.count(); - } - - @Override - public Province save(Province province){ - return provinceRepository.save(province); - } - - @Override - public List save(List provinceList) { - return provinceRepository.save(provinceList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy){ - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = provinceMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return provinceRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return provinceRepository.findAll(); - } - - @Override - public void delete(Integer id){ - provinceRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return provinceMapper.deleteByIds(ids); - } - - @Override - public Province findById(Integer id){ - return provinceRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return provinceMapper.insertList(list); - } - - @Override - public int insert(Province province){ - return provinceMapper.insert(province); - } - - @Override - public int insertSelective(Province province){ - return provinceMapper.insertSelective(province); - } - - @Override - public int updateByPrimaryKey(Province province){ - return provinceMapper.updateByPrimaryKey(province); - } - - @Override - public int updateByPrimaryKeySelective(Province province){ - return provinceMapper.updateByPrimaryKeySelective(province); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = provinceMapper.getList(params); - return new PageInfo<>(list); - } - - @Override - public void batchSave(List list) { - - } - - @Override - public void batchUpdate(List list) { - - } - @Cacheable(value = "chinaRegionCache", key = "'provinces'") @Override public List getCascaderOptionDtos() { diff --git a/common/src/main/java/com/simon/service/impl/ResetPwdInfoServiceImpl.java b/common/src/main/java/com/simon/service/impl/ResetPwdInfoServiceImpl.java index bf2a338758bc93861f939e201f8e8e98e1430447..f090e74328a45b13430f2b8c1bb0c2947e438840 100644 --- a/common/src/main/java/com/simon/service/impl/ResetPwdInfoServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/ResetPwdInfoServiceImpl.java @@ -1,139 +1,26 @@ package com.simon.service.impl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simon.common.config.AppConfig; +import com.simon.common.service.impl.CrudServiceImpl; import com.simon.mapper.ResetPwdInfoMapper; import com.simon.model.ResetPwdInfo; import com.simon.repository.ResetPwdInfoRepository; import com.simon.service.ResetPwdInfoService; -import lombok.var; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; -import java.util.Map; - /** * @author SimonSun * @create 2018-08-06 20:56:26 **/ @Service @Transactional(rollbackFor = {Exception.class}) -public class ResetPwdInfoServiceImpl implements ResetPwdInfoService { +public class ResetPwdInfoServiceImpl extends CrudServiceImpl implements ResetPwdInfoService { @Autowired private ResetPwdInfoMapper resetPwdInfoMapper; @Autowired private ResetPwdInfoRepository resetPwdInfoRepository; - @Override - public long count() { - return resetPwdInfoRepository.count(); - } - - @Override - public ResetPwdInfo save(ResetPwdInfo resetPwdInfo){ - return resetPwdInfoRepository.save(resetPwdInfo); - } - - @Override - public List save(List resetPwdInfoList) { - return resetPwdInfoRepository.save(resetPwdInfoList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = resetPwdInfoMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return resetPwdInfoRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return resetPwdInfoRepository.findAll(); - } - - @Override - public void delete(Long id){ - resetPwdInfoRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return resetPwdInfoMapper.deleteByIds(ids); - } - - @Override - public ResetPwdInfo findById(Long id){ - return resetPwdInfoRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return resetPwdInfoMapper.insertList(list); - } - - @Override - public int insert(ResetPwdInfo resetPwdInfo){ - return resetPwdInfoMapper.insert(resetPwdInfo); - } - - @Override - public int insertSelective(ResetPwdInfo resetPwdInfo){ - return resetPwdInfoMapper.insertSelective(resetPwdInfo); - } - - @Override - public int updateByPrimaryKey(ResetPwdInfo resetPwdInfo) { - return resetPwdInfoMapper.updateByPrimaryKey(resetPwdInfo); - } - - @Override - public int updateByPrimaryKeySelective(ResetPwdInfo resetPwdInfo) { - return resetPwdInfoMapper.updateByPrimaryKeySelective(resetPwdInfo); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - var list = resetPwdInfoMapper.getList(params); - return new PageInfo<>(list); - } - - @Override - public void batchSave(List list) { - - } - - @Override - public void batchUpdate(List list) { - - } } \ No newline at end of file diff --git a/common/src/main/java/com/simon/service/impl/SideMenuAuthorityServiceImpl.java b/common/src/main/java/com/simon/service/impl/SideMenuAuthorityServiceImpl.java index a8f41c8657c4752cff3e30149ded685327a6f617..720932de9d6f1760f6cec5beb512bd15461e0b5d 100644 --- a/common/src/main/java/com/simon/service/impl/SideMenuAuthorityServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/SideMenuAuthorityServiceImpl.java @@ -1,9 +1,7 @@ package com.simon.service.impl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simon.common.config.AppConfig; +import com.simon.common.service.impl.CrudServiceImpl; import com.simon.mapper.SideMenuAuthorityMapper; import com.simon.mapper.SideMenuMapper; import com.simon.model.SideMenuAuthority; @@ -15,15 +13,12 @@ import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; /** @@ -33,7 +28,7 @@ import java.util.stream.Collectors; @Slf4j @Service @Transactional(rollbackFor = {Exception.class}) -public class SideMenuAuthorityServiceImpl implements SideMenuAuthorityService { +public class SideMenuAuthorityServiceImpl extends CrudServiceImpl implements SideMenuAuthorityService { @Autowired private SqlSessionFactory sqlSessionFactory; @@ -46,101 +41,6 @@ public class SideMenuAuthorityServiceImpl implements SideMenuAuthorityService { @Autowired private SideMenuMapper sideMenuMapper; - @Override - public long count() { - return sideMenuAuthorityRepository.count(); - } - - @Override - public SideMenuAuthority save(SideMenuAuthority sideMenuAuthority) { - return sideMenuAuthorityRepository.save(sideMenuAuthority); - } - - @Override - public List save(List sideMenuAuthorityList) { - return sideMenuAuthorityRepository.save(sideMenuAuthorityList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize) { - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)) { - PageHelper.startPage(pageNo, pageSize); - } else { - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = sideMenuAuthorityMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable) { - return sideMenuAuthorityRepository.findAll(pageable); - } - - @Override - public List findAll() { - return sideMenuAuthorityRepository.findAll(); - } - - @Override - public void delete(Long id) { - sideMenuAuthorityRepository.delete(id); - } - - @Override - public int deleteByIds(String ids) { - return sideMenuAuthorityMapper.deleteByIds(ids); - } - - @Override - public SideMenuAuthority findById(Long id) { - return sideMenuAuthorityRepository.findOne(id); - } - - @Override - public int insertList(List list) { - return sideMenuAuthorityMapper.insertList(list); - } - - @Override - public int insert(SideMenuAuthority sideMenuAuthority) { - return sideMenuAuthorityMapper.insert(sideMenuAuthority); - } - - @Override - public int insertSelective(SideMenuAuthority sideMenuAuthority) { - return sideMenuAuthorityMapper.insertSelective(sideMenuAuthority); - } - - @Override - public int updateByPrimaryKey(SideMenuAuthority sideMenuAuthority) { - return sideMenuAuthorityMapper.updateByPrimaryKey(sideMenuAuthority); - } - - @Override - public int updateByPrimaryKeySelective(SideMenuAuthority sideMenuAuthority) { - return sideMenuAuthorityMapper.updateByPrimaryKeySelective(sideMenuAuthority); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize) { - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)) { - PageHelper.startPage(pageNo, pageSize); - } else { - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = sideMenuAuthorityMapper.getList(params); - return new PageInfo<>(list); - } - @Override public void updateAuth(List sideMenuIds, String authority) { sideMenuAuthorityMapper.deleteByAuthorityAndNotIn(authority, StringUtils.join(sideMenuIds, ",")); diff --git a/common/src/main/java/com/simon/service/impl/SideMenuMultiLanguageServiceImpl.java b/common/src/main/java/com/simon/service/impl/SideMenuMultiLanguageServiceImpl.java index 8dd2e85f18406d540ffb8266ee6ebcd3ed53728a..dd9a9516adf9f155bfd0741c4993529d3b3ec643 100644 --- a/common/src/main/java/com/simon/service/impl/SideMenuMultiLanguageServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/SideMenuMultiLanguageServiceImpl.java @@ -1,28 +1,15 @@ package com.simon.service.impl; +import com.simon.common.service.impl.CrudServiceImpl; import com.simon.mapper.SideMenuMultiLanguageMapper; import com.simon.model.SideMenuMultiLanguage; -import com.simon.service.SideMenuMultiLanguageService; import com.simon.repository.SideMenuMultiLanguageRepository; -import com.simon.common.config.AppConfig; +import com.simon.service.SideMenuMultiLanguageService; import lombok.extern.slf4j.Slf4j; -import lombok.var; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; -import org.apache.commons.lang3.StringUtils; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; -import java.time.LocalTime; -import java.time.LocalDate; -import java.time.LocalDateTime; /** * @author jeesun @@ -31,115 +18,11 @@ import java.time.LocalDateTime; @Slf4j @Service @Transactional(rollbackFor = {Exception.class}) -public class SideMenuMultiLanguageServiceImpl implements SideMenuMultiLanguageService { +public class SideMenuMultiLanguageServiceImpl extends CrudServiceImpl implements SideMenuMultiLanguageService { @Autowired private SideMenuMultiLanguageMapper sideMenuMultiLanguageMapper; @Autowired private SideMenuMultiLanguageRepository sideMenuMultiLanguageRepository; - @Override - public long count() { - return sideMenuMultiLanguageRepository.count(); - } - - @Override - public SideMenuMultiLanguage save(SideMenuMultiLanguage sideMenuMultiLanguage){ - return sideMenuMultiLanguageRepository.save(sideMenuMultiLanguage); - } - - @Override - public List save(List sideMenuMultiLanguageList) { - return sideMenuMultiLanguageRepository.save(sideMenuMultiLanguageList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy){ - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = sideMenuMultiLanguageMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return sideMenuMultiLanguageRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return sideMenuMultiLanguageRepository.findAll(); - } - - @Override - public void delete(Long id){ - sideMenuMultiLanguageRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return sideMenuMultiLanguageMapper.deleteByIds(ids); - } - - @Override - public SideMenuMultiLanguage findById(Long id){ - return sideMenuMultiLanguageRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return sideMenuMultiLanguageMapper.insertList(list); - } - - @Override - public int insert(SideMenuMultiLanguage sideMenuMultiLanguage){ - return sideMenuMultiLanguageMapper.insert(sideMenuMultiLanguage); - } - - @Override - public int insertSelective(SideMenuMultiLanguage sideMenuMultiLanguage){ - return sideMenuMultiLanguageMapper.insertSelective(sideMenuMultiLanguage); - } - - @Override - public int updateByPrimaryKey(SideMenuMultiLanguage sideMenuMultiLanguage){ - return sideMenuMultiLanguageMapper.updateByPrimaryKey(sideMenuMultiLanguage); - } - - @Override - public int updateByPrimaryKeySelective(SideMenuMultiLanguage sideMenuMultiLanguage){ - return sideMenuMultiLanguageMapper.updateByPrimaryKeySelective(sideMenuMultiLanguage); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = sideMenuMultiLanguageMapper.getList(params); - return new PageInfo<>(list); - } - - @Override - public void batchSave(List list) { - - } - - @Override - public void batchUpdate(List list) { - - } } \ No newline at end of file diff --git a/common/src/main/java/com/simon/service/impl/SideMenuServiceImpl.java b/common/src/main/java/com/simon/service/impl/SideMenuServiceImpl.java index ff4554d151364f1a130a9d02b6fdbf506eddc540..b0490fe02bae870d2d0108e879200fb0e47ac2b9 100644 --- a/common/src/main/java/com/simon/service/impl/SideMenuServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/SideMenuServiceImpl.java @@ -3,7 +3,7 @@ package com.simon.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simon.common.config.AppConfig; +import com.simon.common.service.impl.CrudServiceImpl; import com.simon.dto.ButtonAuthorityDto; import com.simon.dto.EasyUiTreeDto; import com.simon.dto.SideMenuDto; @@ -19,8 +19,6 @@ import com.simon.service.SideMenuService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -33,7 +31,7 @@ import java.util.*; @Slf4j @Service @Transactional(rollbackFor = {Exception.class}) -public class SideMenuServiceImpl implements SideMenuService { +public class SideMenuServiceImpl extends CrudServiceImpl implements SideMenuService { @Autowired private SideMenuMapper sideMenuMapper; @@ -49,11 +47,6 @@ public class SideMenuServiceImpl implements SideMenuService { @Autowired private SideMenuMultiLanguageMapper sideMenuMultiLanguageMapper; - @Override - public long count() { - return sideMenuRepository.count(); - } - @Override public SideMenu save(SideMenu sideMenu) { if (null == sideMenu.getAuthorities() || sideMenu.getAuthorities().length <= 0) { @@ -72,36 +65,6 @@ public class SideMenuServiceImpl implements SideMenuService { return sideMenu; } - @Override - public List save(List sideMenuList) { - return sideMenuRepository.save(sideMenuList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize) { - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)) { - PageHelper.startPage(pageNo, pageSize); - } else { - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = sideMenuMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable) { - return sideMenuRepository.findAll(pageable); - } - - @Override - public List findAll() { - return sideMenuRepository.findAll(); - } - @Override public void delete(Long id) { sideMenuAuthorityMapper.deleteBySideMenuIdIn(id); @@ -118,35 +81,6 @@ public class SideMenuServiceImpl implements SideMenuService { return 1; } - @Override - public SideMenu findById(Long id) { - return sideMenuRepository.findOne(id); - } - - @Override - public int insertList(List list) { - return sideMenuMapper.insertList(list); - } - - @Override - public int insert(SideMenu sideMenu) { - return sideMenuMapper.insert(sideMenu); - } - - @Override - public int insertSelective(SideMenu sideMenu) { - return sideMenuMapper.insertSelective(sideMenu); - } - - @Override - public int updateByPrimaryKey(SideMenu sideMenu) { - return sideMenuMapper.updateByPrimaryKey(sideMenu); - } - - @Override - public int updateByPrimaryKeySelective(SideMenu sideMenu) { - return sideMenuMapper.updateByPrimaryKeySelective(sideMenu); - } @Override public PageInfo getAll(Map params, Integer limit, Integer offset) { @@ -184,16 +118,6 @@ public class SideMenuServiceImpl implements SideMenuService { return new PageInfo<>(list); } - @Override - public void batchSave(List list) { - - } - - @Override - public void batchUpdate(List list) { - - } - @Override public List getAuth(String typeCode, String language) { List easyUiTreeDtoList = sideMenuMapper.findEasyUiTreeDtoByAuthority(typeCode, language); diff --git a/common/src/main/java/com/simon/service/impl/TownServiceImpl.java b/common/src/main/java/com/simon/service/impl/TownServiceImpl.java index eca325e6e23c5c6bbf0df080d0cbd35ba6e3f30a..86c8f180d87bfadd230468e5f9c45b7c900d0eb9 100644 --- a/common/src/main/java/com/simon/service/impl/TownServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/TownServiceImpl.java @@ -1,24 +1,16 @@ package com.simon.service.impl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simon.common.config.AppConfig; +import com.simon.common.service.impl.CrudServiceImpl; import com.simon.mapper.TownMapper; import com.simon.model.Town; import com.simon.repository.TownRepository; import com.simon.service.TownService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; -import java.util.Map; - /** * @author SimonSun * @date 2019-04-25 @@ -26,115 +18,10 @@ import java.util.Map; @Slf4j @Service @Transactional(rollbackFor = {Exception.class}) -public class TownServiceImpl implements TownService { +public class TownServiceImpl extends CrudServiceImpl implements TownService { @Autowired private TownMapper townMapper; @Autowired private TownRepository townRepository; - - @Override - public long count() { - return townRepository.count(); - } - - @Override - public Town save(Town town){ - return townRepository.save(town); - } - - @Override - public List save(List townList) { - return townRepository.save(townList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy){ - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = townMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return townRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return townRepository.findAll(); - } - - @Override - public void delete(Integer id){ - townRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return townMapper.deleteByIds(ids); - } - - @Override - public Town findById(Integer id){ - return townRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return townMapper.insertList(list); - } - - @Override - public int insert(Town town){ - return townMapper.insert(town); - } - - @Override - public int insertSelective(Town town){ - return townMapper.insertSelective(town); - } - - @Override - public int updateByPrimaryKey(Town town){ - return townMapper.updateByPrimaryKey(town); - } - - @Override - public int updateByPrimaryKeySelective(Town town){ - return townMapper.updateByPrimaryKeySelective(town); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = townMapper.getList(params); - return new PageInfo<>(list); - } - - @Override - public void batchSave(List list) { - - } - - @Override - public void batchUpdate(List list) { - - } } \ No newline at end of file diff --git a/common/src/main/java/com/simon/service/impl/TxSmsServiceImpl.java b/common/src/main/java/com/simon/service/impl/TxSmsServiceImpl.java index 7987309a7e0a9f1f73b0ac52fb87041fc1dc1327..e571b7be141f4b52238253c5a95a3d78759c8734 100644 --- a/common/src/main/java/com/simon/service/impl/TxSmsServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/TxSmsServiceImpl.java @@ -59,8 +59,10 @@ public class TxSmsServiceImpl extends BaseSmsService { SmsSingleSender sender = new SmsSingleSender(appId, appKey); int code = RandomUtils.nextInt(100000, 999999); smsResultDto.setCode(String.valueOf(code)); + log.info("code=" + code); try { - SmsSingleSenderResult result = sender.sendWithParam(nationCode, mobile, templateId, new String[]{String.valueOf(code)}, sign, "", ""); + //SmsSingleSenderResult result = sender.sendWithParam(nationCode, mobile, templateId, new String[]{String.valueOf(code)}, sign, "", ""); + SmsSingleSenderResult result = sender.send(0, "86", mobile, "欢迎成为开药用户！您的初始密码：12345678，您可用此密码登录开药APP，并在“设置”中进行密码修改，谢谢！", "", ""); if (0 == result.result) { smsResultDto.setResult(true); } else { diff --git a/common/src/main/java/com/simon/service/impl/VillageServiceImpl.java b/common/src/main/java/com/simon/service/impl/VillageServiceImpl.java index b4366d249f2ee79f70435918ab1d972a1e442ba4..0e44c8215ac72a1937e8a3a54dc06d6cbc11ab87 100644 --- a/common/src/main/java/com/simon/service/impl/VillageServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/VillageServiceImpl.java @@ -1,24 +1,16 @@ package com.simon.service.impl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simon.common.config.AppConfig; +import com.simon.common.service.impl.CrudServiceImpl; import com.simon.mapper.VillageMapper; import com.simon.model.Village; import com.simon.repository.VillageRepository; import com.simon.service.VillageService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; -import java.util.Map; - /** * @author SimonSun * @date 2019-04-24 @@ -26,115 +18,11 @@ import java.util.Map; @Slf4j @Service @Transactional(rollbackFor = {Exception.class}) -public class VillageServiceImpl implements VillageService { +public class VillageServiceImpl extends CrudServiceImpl implements VillageService { @Autowired private VillageMapper villageMapper; @Autowired private VillageRepository villageRepository; - @Override - public long count() { - return villageRepository.count(); - } - - @Override - public Village save(Village village){ - return villageRepository.save(village); - } - - @Override - public List save(List villageList) { - return villageRepository.save(villageList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy){ - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = villageMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return villageRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return villageRepository.findAll(); - } - - @Override - public void delete(Integer id){ - villageRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return villageMapper.deleteByIds(ids); - } - - @Override - public Village findById(Integer id){ - return villageRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return villageMapper.insertList(list); - } - - @Override - public int insert(Village village){ - return villageMapper.insert(village); - } - - @Override - public int insertSelective(Village village){ - return villageMapper.insertSelective(village); - } - - @Override - public int updateByPrimaryKey(Village village){ - return villageMapper.updateByPrimaryKey(village); - } - - @Override - public int updateByPrimaryKeySelective(Village village){ - return villageMapper.updateByPrimaryKeySelective(village); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = villageMapper.getList(params); - return new PageInfo<>(list); - } - - @Override - public void batchSave(List list) { - - } - - @Override - public void batchUpdate(List list) { - - } } \ No newline at end of file diff --git a/common/src/main/resources/templates/code/entity.ftl b/common/src/main/resources/templates/code/entity.ftl index 3e3207b06a650fd0127ab08d8d0fd9d785117829..e8bdbd1193e6be76ccae7c0336549445803acc8f 100644 --- a/common/src/main/resources/templates/code/entity.ftl +++ b/common/src/main/resources/templates/code/entity.ftl @@ -1,5 +1,6 @@ package ${basePackage}.model; +import com.simon.common.domain.BasePo; import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.ToStringSerializer; import com.fasterxml.jackson.annotation.JsonFormat; @@ -34,10 +35,10 @@ import java.time.LocalDateTime; @ExcelTable(sheetName = "${tableComment}", workbookType = WorkbookType.SXLSX, rowAccessWindowSize = 100, useFieldNameAsTitle = true) @ApiModel(description = "${tableComment}") @Data -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode(callSuper = true) @Entity @Table(name="${tableName}") -public class ${entityName} implements Serializable { +public class ${entityName} extends BasePo<${idType}> implements Serializable { @ExcludeColumn private static final long serialVersionUID = 1L; <#list columns as column> diff --git a/common/src/main/resources/templates/code/mapper.ftl b/common/src/main/resources/templates/code/mapper.ftl index 77f3ef2062af8d7b9bc34db1589b1f94e17db08d..e158ee20328aa946b67dd0e579bfabf3376d8725 100644 --- a/common/src/main/resources/templates/code/mapper.ftl +++ b/common/src/main/resources/templates/code/mapper.ftl @@ -1,6 +1,6 @@ package ${basePackage}.mapper; -import ${basePackage}.common.mapper.MyMapper; +import ${basePackage}.common.mapper.CrudMapper; import ${basePackage}.model.${modelNameUpperCamel}; import ${basePackage}.provider.${modelNameUpperCamel}Provider; import org.apache.ibatis.annotations.Mapper; @@ -20,7 +20,7 @@ import java.time.LocalDateTime; * @date ${CREATE} **/ @Mapper -public interface ${modelNameUpperCamel}Mapper extends MyMapper<${modelNameUpperCamel}> { +public interface ${modelNameUpperCamel}Mapper extends CrudMapper<${modelNameUpperCamel}> { /** * 使用Map查询 * @param map 查询条件 diff --git a/common/src/main/resources/templates/code/service-impl.ftl b/common/src/main/resources/templates/code/service-impl.ftl index 2f7e6be1df2c8b43eeff0de9df6e12fae007a594..30188935cef05501f1bb07c4c73ef7f9e929517e 100644 --- a/common/src/main/resources/templates/code/service-impl.ftl +++ b/common/src/main/resources/templates/code/service-impl.ftl @@ -1,6 +1,7 @@ package ${basePackage}.service.impl; +import com.simon.common.service.impl.CrudServiceImpl; import ${basePackage}.mapper.${modelNameUpperCamel}Mapper; import ${basePackage}.model.${modelNameUpperCamel}; import ${basePackage}.service.${modelNameUpperCamel}Service; @@ -34,128 +35,6 @@ import java.time.LocalDateTime; @Slf4j @Service @Transactional(rollbackFor = {Exception.class}) -public class ${modelNameUpperCamel}ServiceImpl implements ${modelNameUpperCamel}Service { - @Autowired - private SqlSessionFactory sqlSessionFactory; +public class ${modelNameUpperCamel}ServiceImpl extends CrudServiceImpl<${modelNameUpperCamel}, ${idType}> implements ${modelNameUpperCamel}Service { - @Autowired - private ${modelNameUpperCamel}Mapper ${modelNameLowerCamel}Mapper; - - @Autowired - private ${modelNameUpperCamel}Repository ${modelNameLowerCamel}Repository; - - @Override - public long count() { - return ${modelNameLowerCamel}Repository.count(); - } - - @Override - public ${modelNameUpperCamel} save(${modelNameUpperCamel} ${modelNameLowerCamel}){ - return ${modelNameLowerCamel}Repository.save(${modelNameLowerCamel}); - } - - @Override - public List<${modelNameUpperCamel}> save(List<${modelNameUpperCamel}> ${modelNameLowerCamel}List) { - return ${modelNameLowerCamel}Repository.save(${modelNameLowerCamel}List); - } - - @Override - public PageInfo<${modelNameUpperCamel}> findAll(Integer pageNo, Integer pageSize, String orderBy){ - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List<${modelNameUpperCamel}> list = ${modelNameLowerCamel}Mapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page<${modelNameUpperCamel}> findAll(Pageable pageable){ - return ${modelNameLowerCamel}Repository.findAll(pageable); - } - - @Override - public List<${modelNameUpperCamel}> findAll(){ - return ${modelNameLowerCamel}Repository.findAll(); - } - - @Override - public void delete(${idType} id){ - ${modelNameLowerCamel}Repository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return ${modelNameLowerCamel}Mapper.deleteByIds(ids); - } - - @Override - public ${modelNameUpperCamel} findById(${idType} id){ - return ${modelNameLowerCamel}Repository.findOne(id); - } - - @Override - public int insertList(List<${modelNameUpperCamel}> list){ - return ${modelNameLowerCamel}Mapper.insertList(list); - } - - @Override - public int insert(${modelNameUpperCamel} ${modelNameLowerCamel}){ - return ${modelNameLowerCamel}Mapper.insert(${modelNameLowerCamel}); - } - - @Override - public int insertSelective(${modelNameUpperCamel} ${modelNameLowerCamel}){ - return ${modelNameLowerCamel}Mapper.insertSelective(${modelNameLowerCamel}); - } - - @Override - public int updateByPrimaryKey(${modelNameUpperCamel} ${modelNameLowerCamel}){ - return ${modelNameLowerCamel}Mapper.updateByPrimaryKey(${modelNameLowerCamel}); - } - - @Override - public int updateByPrimaryKeySelective(${modelNameUpperCamel} ${modelNameLowerCamel}){ - return ${modelNameLowerCamel}Mapper.updateByPrimaryKeySelective(${modelNameLowerCamel}); - } - - @Override - public PageInfo<${modelNameUpperCamel}> getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List<${modelNameUpperCamel}> list = ${modelNameLowerCamel}Mapper.getList(params); - return new PageInfo<>(list); - } - - @Override - public void batchSave(List<${modelNameUpperCamel}> list) { - SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH); - ${modelNameUpperCamel}Mapper mapper = sqlSession.getMapper(${modelNameUpperCamel}Mapper.class); - for (${modelNameUpperCamel} item : list) { - mapper.insert(item); - } - sqlSession.commit(); - } - - @Override - public void batchUpdate(List<${modelNameUpperCamel}> list) { - SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH); - ${modelNameUpperCamel}Mapper mapper = sqlSession.getMapper(${modelNameUpperCamel}Mapper.class); - for (${modelNameUpperCamel} item : list) { - mapper.updateByPrimaryKeySelective(item); - } - sqlSession.commit(); - } } \ No newline at end of file diff --git a/common/src/main/resources/templates/code/service.ftl b/common/src/main/resources/templates/code/service.ftl index db45944dd6fe2238bd4650b505cfa9f55db5bb5a..fea80fd362e2a78e9ff0022a4adfa0d2ef3faa4e 100644 --- a/common/src/main/resources/templates/code/service.ftl +++ b/common/src/main/resources/templates/code/service.ftl @@ -1,6 +1,6 @@ package ${basePackage}.service; import ${basePackage}.model.${modelNameUpperCamel}; -import ${basePackage}.common.service.BasicService; +import ${basePackage}.common.service.CrudService; import java.time.LocalTime; import java.time.LocalDate; @@ -10,6 +10,6 @@ import java.time.LocalDateTime; * @author ${AUTHOR} * @date ${CREATE} **/ -public interface ${modelNameUpperCamel}Service extends BasicService<${modelNameUpperCamel}, ${idType}> { +public interface ${modelNameUpperCamel}Service extends CrudService<${modelNameUpperCamel}, ${idType}> { } \ No newline at end of file diff --git a/pom.xml b/pom.xml index 12ebd1bfd53ccfdecbf856645ea519d51ed3ca40..85fb8175266dd356ca60c9f51341ea0e0699583a 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 1.2.57 1.0.6 5.4.3.Final - 2.7.1 + 2.7.4 com.simon @@ -245,6 +245,16 @@ 10.2.0.3.0 runtime + + com.microsoft.sqlserver + mssql-jdbc + 7.2.2.jre8 + + + com.microsoft.sqlserver + sqljdbc4 + 4.0 + org.apache.httpcomponents diff --git a/web/pom.xml b/web/pom.xml index 2b5ca72e6a9133c2cfb6dedb208c0155c513ea1d..afca8cc87d95dacd3b10e5b45ffade710dfcf6c3 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -132,6 +132,16 @@ ojdbc14 runtime + + com.microsoft.sqlserver + mssql-jdbc + runtime + + + com.microsoft.sqlserver + sqljdbc4 + runtime + org.apache.httpcomponents diff --git a/web/src/main/java/com/simon/common/plugins/jwt/CustomTokenEnhancer.java b/web/src/main/java/com/simon/common/plugins/jwt/CustomTokenEnhancer.java index d82418fc37249850b05b0eefc1a04435473f975f..1b36e78da3b77fe54b8c46ba4c2590e0edbe3c37 100644 --- a/web/src/main/java/com/simon/common/plugins/jwt/CustomTokenEnhancer.java +++ b/web/src/main/java/com/simon/common/plugins/jwt/CustomTokenEnhancer.java @@ -1,11 +1,13 @@ package com.simon.common.plugins.jwt; +import com.alibaba.fastjson.JSON; +import lombok.extern.slf4j.Slf4j; import org.springframework.security.oauth2.common.DefaultOAuth2AccessToken; import org.springframework.security.oauth2.common.OAuth2AccessToken; import org.springframework.security.oauth2.provider.OAuth2Authentication; import org.springframework.security.oauth2.provider.token.TokenEnhancer; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; /** @@ -14,13 +16,17 @@ import java.util.Map; * @author simon * @date 2018-12-05 **/ - +@Slf4j public class CustomTokenEnhancer implements TokenEnhancer { @Override public OAuth2AccessToken enhance(OAuth2AccessToken oAuth2AccessToken, OAuth2Authentication oAuth2Authentication) { - Map additionalInfo = new HashMap<>(); - additionalInfo.put("test", oAuth2Authentication.getName()); - ((DefaultOAuth2AccessToken)oAuth2AccessToken).setAdditionalInformation(additionalInfo); + if (oAuth2AccessToken instanceof DefaultOAuth2AccessToken){ + DefaultOAuth2AccessToken token= (DefaultOAuth2AccessToken) oAuth2AccessToken; + Map additionalInformation = new LinkedHashMap(); + additionalInformation.put("username",oAuth2Authentication.getName()); + token.setAdditionalInformation(additionalInformation); + } + log.info(JSON.toJSONString(oAuth2AccessToken)); return oAuth2AccessToken; } } diff --git a/web/src/main/java/com/simon/controller/TableController.java b/web/src/main/java/com/simon/controller/TableController.java index bc7e4def5e442b19362cf445e9f923d28fc1b0f8..da9af2170b8bc0730ab84553a1139efba3bf824c 100644 --- a/web/src/main/java/com/simon/controller/TableController.java +++ b/web/src/main/java/com/simon/controller/TableController.java @@ -189,6 +189,9 @@ public class TableController extends BaseController { @RequestMapping(value = "genCode", method = {RequestMethod.GET, RequestMethod.POST}) @ResponseBody public ResultMsg genCode(@RequestBody GenCodeDto body, Authentication authentication) { + body.setTableName(StringUtils.deleteWhitespace(body.getTableName())); + body.setEntityName(StringUtils.deleteWhitespace(body.getEntityName())); + body.setTableComment(StringUtils.deleteWhitespace(body.getTableComment())); String tableComment = body.getTableComment(); //去掉最后一个“表”字 if (tableComment.lastIndexOf("表") > 0) { diff --git a/web/src/main/resources/code-gen.properties b/web/src/main/resources/code-gen.properties index 3ccb414bb14ce203619dfd1c8b4624254dfe17c9..96e03dfe465a292c19bf01bced8fe3e9f263c98a 100644 --- a/web/src/main/resources/code-gen.properties +++ b/web/src/main/resources/code-gen.properties @@ -1,9 +1,9 @@ # \u4EE3\u7801\u751F\u6210\u5668\u914D\u7F6E # MySQL -jdbc_url=jdbc:mysql://127.0.0.1:3306/thymelte?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false -jdbc_username=root -jdbc_password=19941017 -jdbc_driver_class_name=com.mysql.cj.jdbc.Driver +#jdbc_url=jdbc:mysql://127.0.0.1:3306/thymelte?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false +#jdbc_username=root +#jdbc_password=19941017 +#jdbc_driver_class_name=com.mysql.cj.jdbc.Driver # PostgreSQL #jdbc_url=jdbc:postgresql://127.0.0.1:5432/thymelte?useUnicode=true&characterEncoding=UTF-8 @@ -17,6 +17,12 @@ jdbc_driver_class_name=com.mysql.cj.jdbc.Driver #jdbc_password=yuhang #jdbc_driver_class_name=oracle.jdbc.OracleDriver +# SQL Server +jdbc_url=jdbc:sqlserver://localhost:1433;DatabaseName=electricity +jdbc_username=sa +jdbc_password=123456 +jdbc_driver_class_name=com.microsoft.sqlserver.jdbc.SQLServerDriver + # Spring Boot\u6A21\u5757\u76EE\u5F55 # Mapper\u63D2\u4EF6\u57FA\u7840\u63A5\u53E3\u7684\u5B8C\u5168\u9650\u5B9A\u540D(\u7B2C\u4E8C\u6B65\u63D0\u5230\u7684\u6838\u5FC3\u7EE7\u627F\u63A5\u53E3Mapper) mapper_interface_reference=@base.package@.common.mapper.MyMapper \ No newline at end of file diff --git a/web/src/main/resources/templates/code/entity.ftl b/web/src/main/resources/templates/code/entity.ftl index 3e3207b06a650fd0127ab08d8d0fd9d785117829..e8bdbd1193e6be76ccae7c0336549445803acc8f 100644 --- a/web/src/main/resources/templates/code/entity.ftl +++ b/web/src/main/resources/templates/code/entity.ftl @@ -1,5 +1,6 @@ package ${basePackage}.model; +import com.simon.common.domain.BasePo; import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.ToStringSerializer; import com.fasterxml.jackson.annotation.JsonFormat; @@ -34,10 +35,10 @@ import java.time.LocalDateTime; @ExcelTable(sheetName = "${tableComment}", workbookType = WorkbookType.SXLSX, rowAccessWindowSize = 100, useFieldNameAsTitle = true) @ApiModel(description = "${tableComment}") @Data -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode(callSuper = true) @Entity @Table(name="${tableName}") -public class ${entityName} implements Serializable { +public class ${entityName} extends BasePo<${idType}> implements Serializable { @ExcludeColumn private static final long serialVersionUID = 1L; <#list columns as column> diff --git a/web/src/main/resources/templates/code/mapper.ftl b/web/src/main/resources/templates/code/mapper.ftl index 77f3ef2062af8d7b9bc34db1589b1f94e17db08d..e158ee20328aa946b67dd0e579bfabf3376d8725 100644 --- a/web/src/main/resources/templates/code/mapper.ftl +++ b/web/src/main/resources/templates/code/mapper.ftl @@ -1,6 +1,6 @@ package ${basePackage}.mapper; -import ${basePackage}.common.mapper.MyMapper; +import ${basePackage}.common.mapper.CrudMapper; import ${basePackage}.model.${modelNameUpperCamel}; import ${basePackage}.provider.${modelNameUpperCamel}Provider; import org.apache.ibatis.annotations.Mapper; @@ -20,7 +20,7 @@ import java.time.LocalDateTime; * @date ${CREATE} **/ @Mapper -public interface ${modelNameUpperCamel}Mapper extends MyMapper<${modelNameUpperCamel}> { +public interface ${modelNameUpperCamel}Mapper extends CrudMapper<${modelNameUpperCamel}> { /** * 使用Map查询 * @param map 查询条件 diff --git a/web/src/main/resources/templates/code/service-impl.ftl b/web/src/main/resources/templates/code/service-impl.ftl index 2f7e6be1df2c8b43eeff0de9df6e12fae007a594..30188935cef05501f1bb07c4c73ef7f9e929517e 100644 --- a/web/src/main/resources/templates/code/service-impl.ftl +++ b/web/src/main/resources/templates/code/service-impl.ftl @@ -1,6 +1,7 @@ package ${basePackage}.service.impl; +import com.simon.common.service.impl.CrudServiceImpl; import ${basePackage}.mapper.${modelNameUpperCamel}Mapper; import ${basePackage}.model.${modelNameUpperCamel}; import ${basePackage}.service.${modelNameUpperCamel}Service; @@ -34,128 +35,6 @@ import java.time.LocalDateTime; @Slf4j @Service @Transactional(rollbackFor = {Exception.class}) -public class ${modelNameUpperCamel}ServiceImpl implements ${modelNameUpperCamel}Service { - @Autowired - private SqlSessionFactory sqlSessionFactory; +public class ${modelNameUpperCamel}ServiceImpl extends CrudServiceImpl<${modelNameUpperCamel}, ${idType}> implements ${modelNameUpperCamel}Service { - @Autowired - private ${modelNameUpperCamel}Mapper ${modelNameLowerCamel}Mapper; - - @Autowired - private ${modelNameUpperCamel}Repository ${modelNameLowerCamel}Repository; - - @Override - public long count() { - return ${modelNameLowerCamel}Repository.count(); - } - - @Override - public ${modelNameUpperCamel} save(${modelNameUpperCamel} ${modelNameLowerCamel}){ - return ${modelNameLowerCamel}Repository.save(${modelNameLowerCamel}); - } - - @Override - public List<${modelNameUpperCamel}> save(List<${modelNameUpperCamel}> ${modelNameLowerCamel}List) { - return ${modelNameLowerCamel}Repository.save(${modelNameLowerCamel}List); - } - - @Override - public PageInfo<${modelNameUpperCamel}> findAll(Integer pageNo, Integer pageSize, String orderBy){ - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List<${modelNameUpperCamel}> list = ${modelNameLowerCamel}Mapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page<${modelNameUpperCamel}> findAll(Pageable pageable){ - return ${modelNameLowerCamel}Repository.findAll(pageable); - } - - @Override - public List<${modelNameUpperCamel}> findAll(){ - return ${modelNameLowerCamel}Repository.findAll(); - } - - @Override - public void delete(${idType} id){ - ${modelNameLowerCamel}Repository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return ${modelNameLowerCamel}Mapper.deleteByIds(ids); - } - - @Override - public ${modelNameUpperCamel} findById(${idType} id){ - return ${modelNameLowerCamel}Repository.findOne(id); - } - - @Override - public int insertList(List<${modelNameUpperCamel}> list){ - return ${modelNameLowerCamel}Mapper.insertList(list); - } - - @Override - public int insert(${modelNameUpperCamel} ${modelNameLowerCamel}){ - return ${modelNameLowerCamel}Mapper.insert(${modelNameLowerCamel}); - } - - @Override - public int insertSelective(${modelNameUpperCamel} ${modelNameLowerCamel}){ - return ${modelNameLowerCamel}Mapper.insertSelective(${modelNameLowerCamel}); - } - - @Override - public int updateByPrimaryKey(${modelNameUpperCamel} ${modelNameLowerCamel}){ - return ${modelNameLowerCamel}Mapper.updateByPrimaryKey(${modelNameLowerCamel}); - } - - @Override - public int updateByPrimaryKeySelective(${modelNameUpperCamel} ${modelNameLowerCamel}){ - return ${modelNameLowerCamel}Mapper.updateByPrimaryKeySelective(${modelNameLowerCamel}); - } - - @Override - public PageInfo<${modelNameUpperCamel}> getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List<${modelNameUpperCamel}> list = ${modelNameLowerCamel}Mapper.getList(params); - return new PageInfo<>(list); - } - - @Override - public void batchSave(List<${modelNameUpperCamel}> list) { - SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH); - ${modelNameUpperCamel}Mapper mapper = sqlSession.getMapper(${modelNameUpperCamel}Mapper.class); - for (${modelNameUpperCamel} item : list) { - mapper.insert(item); - } - sqlSession.commit(); - } - - @Override - public void batchUpdate(List<${modelNameUpperCamel}> list) { - SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH); - ${modelNameUpperCamel}Mapper mapper = sqlSession.getMapper(${modelNameUpperCamel}Mapper.class); - for (${modelNameUpperCamel} item : list) { - mapper.updateByPrimaryKeySelective(item); - } - sqlSession.commit(); - } } \ No newline at end of file diff --git a/web/src/main/resources/templates/code/service.ftl b/web/src/main/resources/templates/code/service.ftl index db45944dd6fe2238bd4650b505cfa9f55db5bb5a..fea80fd362e2a78e9ff0022a4adfa0d2ef3faa4e 100644 --- a/web/src/main/resources/templates/code/service.ftl +++ b/web/src/main/resources/templates/code/service.ftl @@ -1,6 +1,6 @@ package ${basePackage}.service; import ${basePackage}.model.${modelNameUpperCamel}; -import ${basePackage}.common.service.BasicService; +import ${basePackage}.common.service.CrudService; import java.time.LocalTime; import java.time.LocalDate; @@ -10,6 +10,6 @@ import java.time.LocalDateTime; * @author ${AUTHOR} * @date ${CREATE} **/ -public interface ${modelNameUpperCamel}Service extends BasicService<${modelNameUpperCamel}, ${idType}> { +public interface ${modelNameUpperCamel}Service extends CrudService<${modelNameUpperCamel}, ${idType}> { } \ No newline at end of file diff --git a/web/src/main/resources/templates/vue/table/code_generate.html b/web/src/main/resources/templates/vue/table/code_generate.html index 5e3a430affbe05af004a3a9fe4a2c3a5a0088a4d..f82f2ba049e9bf32d074d624b99efc5a134ad0fc 100644 --- a/web/src/main/resources/templates/vue/table/code_generate.html +++ b/web/src/main/resources/templates/vue/table/code_generate.html @@ -68,6 +68,7 @@ +