diff --git a/src/taoshop-common/taoshop-common-core/src/main/java/com/muses/taoshop/common/core/database/config/MybatisConfig.java b/src/taoshop-common/taoshop-common-core/src/main/java/com/muses/taoshop/common/core/database/config/MybatisConfig.java index fa605ff7a48ebd5d97699bda9b07d6d8b681997c..2c832e29728e29a1f5c386677a1ac7f1a2e9043c 100644 --- a/src/taoshop-common/taoshop-common-core/src/main/java/com/muses/taoshop/common/core/database/config/MybatisConfig.java +++ b/src/taoshop-common/taoshop-common-core/src/main/java/com/muses/taoshop/common/core/database/config/MybatisConfig.java @@ -58,10 +58,10 @@ import static com.muses.taoshop.common.core.database.config.BaseConfig.*; ) @EnableTransactionManagement @Configuration -@ConditionalOnClass({ SqlSessionFactory.class, SqlSessionFactoryBean.class }) -@ConditionalOnBean(DataSource.class) -@EnableConfigurationProperties(MybatisProperties.class) -@AutoConfigureAfter(DataSourceAutoConfiguration.class) +//@ConditionalOnClass({ SqlSessionFactory.class, SqlSessionFactoryBean.class }) +//@ConditionalOnBean(DataSource.class) +//@EnableConfigurationProperties(MybatisProperties.class) +//@AutoConfigureAfter(DataSourceAutoConfiguration.class) public class MybatisConfig { @Bean(name = DATA_SOURCE_NAME) @@ -81,7 +81,6 @@ public class MybatisConfig { //factoryBean.setConfigLocation(new ClassPathResource("mybatis-config.xml")); ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); try{ - //factoryBean.setVfs(SpringBootVFS.class); factoryBean.setMapperLocations(resolver.getResources("classpath*:/mybatis/*Mapper.xml")); //factoryBean.setVfs(SpringBootVFS.class); String typeAliasesPackage=setTypeAliasesPackage(ENTITY_PACKAGES); @@ -118,7 +117,7 @@ public class MybatisConfig { metadataReader = metadataReaderFactory .getMetadataReader(resource); try { - // System.out.println(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName()); +// System.out.println(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName()); result.add(Class .forName( metadataReader.getClassMetadata() @@ -135,7 +134,7 @@ public class MybatisConfig { result.clear(); result.addAll(h); typeAliasesPackage=String.join(",",(String[]) result.toArray(new String[0])); - System.out.println(typeAliasesPackage); +// System.out.println(typeAliasesPackage); } else { throw new RuntimeException( "mybatis typeAliasesPackage 路径扫描错误,参数typeAliasesPackage:" diff --git a/src/taoshop-portal/src/main/java/com/muses/taoshop/web/controller/BaseController.java b/src/taoshop-portal/src/main/java/com/muses/taoshop/web/controller/BaseController.java index ff4db303623beac874255d3f2771190ddcbc97d9..699e643da632211706b79eb84fdaef36e55f1a17 100644 --- a/src/taoshop-portal/src/main/java/com/muses/taoshop/web/controller/BaseController.java +++ b/src/taoshop-portal/src/main/java/com/muses/taoshop/web/controller/BaseController.java @@ -1,11 +1,11 @@ package com.muses.taoshop.web.controller; + import org.apache.log4j.Logger; -import org.slf4j.LoggerFactory; /** * 
- *  TODO 类说明
+ *  基础控制类
  *
* * @author nicky @@ -17,16 +17,20 @@ import org.slf4j.LoggerFactory; */ public class BaseController { - public Logger log = null; - - /** - * 获取日志对象 - * @return - */ - public Logger getInstance(){ - if(log == null){ - log = (Logger) LoggerFactory.getLogger(BaseController.class); - } - return log; + public Logger log = Logger.getLogger(getClass()); + + + public void debug(String message , Exception e){ + log.debug(message , e); + } + + public void info(String message,Exception e){ + log.info(message , e); } + + public void error(String message,Exception e){ + log.error(message , e); + } + + } diff --git a/src/taoshop-portal/src/main/java/com/muses/taoshop/web/controller/portal/IndexController.java b/src/taoshop-portal/src/main/java/com/muses/taoshop/web/controller/portal/IndexController.java index c46e017501db8371a6e0988e314cef9bb4e7d1a0..4088a8f45850d9e70b4400ab6b816567ee9a613d 100644 --- a/src/taoshop-portal/src/main/java/com/muses/taoshop/web/controller/portal/IndexController.java +++ b/src/taoshop-portal/src/main/java/com/muses/taoshop/web/controller/portal/IndexController.java @@ -3,18 +3,14 @@ package com.muses.taoshop.web.controller.portal; import com.alibaba.fastjson.JSON; import com.muses.taoshop.item.entity.ItemBrand; import com.muses.taoshop.item.entity.ItemCategory; -import com.muses.taoshop.item.entity.dto.ItemCategoryDTO; import com.muses.taoshop.item.service.IItemBrankService; import com.muses.taoshop.item.service.IItemCategoryService; import com.muses.taoshop.web.controller.BaseController; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; /** @@ -60,12 +56,11 @@ public class IndexController extends BaseController{ @GetMapping(value = "/listRootCategory") @ResponseBody public String listRootCategory(){ - List categories = new ArrayList(); - categories = iItemCategoryService.listCategory(); + List categories = iItemCategoryService.listCategory(); String jsonString = ""; if(!CollectionUtils.isEmpty(categories)){ jsonString = JSON.toJSON(categories).toString(); - //log.debug("商品品类信息json数据:"+jsonString); + log.debug("get root category info:"+jsonString); return jsonString; } return jsonString; diff --git a/src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/entity/ItemCategory.java b/src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/entity/ItemCategory.java index d495ad22de5349ea773fa9c1fb11eeef369e7f0e..319df6ba2c2658a6adb6475e9200abf4a7b9373c 100644 --- a/src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/entity/ItemCategory.java +++ b/src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/entity/ItemCategory.java @@ -1,5 +1,8 @@ package com.muses.taoshop.item.entity; + +import org.springframework.format.annotation.DateTimeFormat; + import java.util.Date; import java.util.List; @@ -33,11 +36,13 @@ public class ItemCategory { /** * 上次修改时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date lastModifyTime; /** * 创建时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; /** diff --git a/src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/entity/dto/ItemCategoryDTO.java b/src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/entity/dto/ItemCategoryDTO.java deleted file mode 100644 index b09a5e67d1d96fd2332a8dc222a136198d9536d1..0000000000000000000000000000000000000000 --- a/src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/entity/dto/ItemCategoryDTO.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.muses.taoshop.item.entity.dto; - -import com.muses.taoshop.item.entity.ItemCategory; - -import java.util.Date; -import java.util.List; - - -/** - * 
- *  商品品类
- *
- * @author nicky - * @version 1.00.00 - * 
- * 修改记录
- *    修改后版本:     修改人：  修改日期: 2018.06.09 21:49    修改内容:
- *
- */ -public class ItemCategoryDTO { - /** - * 商品品类id - */ - private Long id; - - /** - * 商品品类名称 - */ - private String categoryName; - - /** - * 上级id - */ - private Long sjid; - - /** - * 上次修改时间 - */ - private Date lastModifyTime; - - /** - * 创建时间 - */ - private Date createTime; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getCategoryName() { - return categoryName; - } - - - public void setCategoryName(String categoryName) { - this.categoryName = categoryName == null ? null : categoryName.trim(); - } - - public Long getSjid() { - return sjid; - } - - public void setSjid(Long sjid) { - this.sjid = sjid; - } - - public Date getLastModifyTime() { - return lastModifyTime; - } - - public void setLastModifyTime(Date lastModifyTime) { - this.lastModifyTime = lastModifyTime; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } -} diff --git a/src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/entity/vo/ItemCategoryVO.java b/src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/entity/vo/ItemCategoryVO.java deleted file mode 100644 index 159865d7489afbbd20770a9490ba1a69e140e826..0000000000000000000000000000000000000000 --- a/src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/entity/vo/ItemCategoryVO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.muses.taoshop.item.entity.vo; - -/** - * 
- *  TODO 类说明
- *
- * - * @author nicky - * @version 1.00.00 - * 
- * 修改记录
- *    修改后版本:     修改人：  修改日期: 2018.06.18 00:06    修改内容:
- *
- */ -public class ItemCategoryVO { -} diff --git a/src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/service/IItemCategoryService.java b/src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/service/IItemCategoryService.java index 732838a89c5320eb48e26c6e94f9012e20dac5c7..7daad2b14d42c2e167bb339e9928345850300c4b 100644 --- a/src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/service/IItemCategoryService.java +++ b/src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/service/IItemCategoryService.java @@ -1,7 +1,6 @@ package com.muses.taoshop.item.service; import com.muses.taoshop.item.entity.ItemCategory; -import com.muses.taoshop.item.entity.dto.ItemCategoryDTO; import java.util.List; @@ -22,5 +21,5 @@ public interface IItemCategoryService { * 查询根级商品品类信息 * @return */ - List listCategory(); + List listCategory(); } diff --git a/src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/mapper/ItemCategoryMapper.java b/src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/mapper/ItemCategoryMapper.java index c808399e5a13662a8198e4926d5aa96526eafc2d..20e679de6873c5cd0c4f8fb5f7fce48afe77ed1f 100644 --- a/src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/mapper/ItemCategoryMapper.java +++ b/src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/mapper/ItemCategoryMapper.java @@ -2,13 +2,12 @@ package com.muses.taoshop.item.mapper; import com.muses.taoshop.common.core.database.annotation.MybatisRepository; import com.muses.taoshop.item.entity.ItemCategory; -import com.muses.taoshop.item.entity.dto.ItemCategoryDTO; import java.util.List; @MybatisRepository public interface ItemCategoryMapper { - List listRootCategory(); + List listRootCategory(); } \ No newline at end of file diff --git a/src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/service/ItemCategoryServiceImpl.java b/src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/service/ItemCategoryServiceImpl.java index 0d627c6a51e31c2cf142d191a2d1bd70494b7955..3f8242e80da8fa0b49763d01eb777f457f6829ce 100644 --- a/src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/service/ItemCategoryServiceImpl.java +++ b/src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/service/ItemCategoryServiceImpl.java @@ -1,7 +1,6 @@ package com.muses.taoshop.item.service; import com.muses.taoshop.item.entity.ItemCategory; -import com.muses.taoshop.item.entity.dto.ItemCategoryDTO; import com.muses.taoshop.item.mapper.ItemCategoryMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,7 +31,7 @@ public class ItemCategoryServiceImpl implements IItemCategoryService{ * @return */ @Override - public List listCategory() { + public List listCategory() { return itemCategoryMapper.listRootCategory(); } } diff --git a/src/taoshop-provider/taoshop-provider-item/src/main/resources/mybatis/ItemCategoryMapper.xml b/src/taoshop-provider/taoshop-provider-item/src/main/resources/mybatis/ItemCategoryMapper.xml index f745f07d3ef0753df077c065b60279ab04b7baa4..7d0409d24afe48f643d67b3b4664cd48415b4e9f 100644 --- a/src/taoshop-provider/taoshop-provider-item/src/main/resources/mybatis/ItemCategoryMapper.xml +++ b/src/taoshop-provider/taoshop-provider-item/src/main/resources/mybatis/ItemCategoryMapper.xml @@ -10,10 +10,14 @@ - id, category_name, sjid, last_modify_time, create_time + id, + category_name as categoryName, + sjid, + last_modify_time as lastModifyTime, + create_time as createTime - SELECT FROM item_category t