diff --git a/src/main/java/com/xmomen/module/beforehandpackagerecord/controller/BeforehandPackageRecordController.java b/src/main/java/com/xmomen/module/beforehandpackagerecord/controller/BeforehandPackageRecordController.java index 7d87465..5fd9983 100644 --- a/src/main/java/com/xmomen/module/beforehandpackagerecord/controller/BeforehandPackageRecordController.java +++ b/src/main/java/com/xmomen/module/beforehandpackagerecord/controller/BeforehandPackageRecordController.java @@ -29,11 +29,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.List; -/** - * @author tanxinzheng - * @version 1.0.0 - * @date 2017-5-18 23:36:38 - */ + @RestController @RequestMapping(value = "/beforehandPackageRecord") public class BeforehandPackageRecordController { @@ -41,16 +37,7 @@ public class BeforehandPackageRecordController { @Autowired BeforehandPackageRecordService beforehandPackageRecordService; - /** - * 预包装记录表列表 - * - * @param limit 每页结果数 - * @param offset 页码 - * @param id 主键 - * @param ids 主键数组 - * @param excludeIds 不包含主键数组 - * @return Page 预包装记录表领域分页对象 - */ + // 查询预包装记录表列表 @RequestMapping(method = RequestMethod.GET) @Log(actionName = "查询预包装记录表列表") public Page getBeforehandPackageRecordList(@RequestParam(value = "limit") Integer limit, @@ -72,12 +59,7 @@ public class BeforehandPackageRecordController { return beforehandPackageRecordService.getBeforehandPackageRecordModelPage(limit, offset, beforehandPackageRecordQuery); } - /** - * 查询单个预包装记录表 - * - * @param id 主键 - * @return BeforehandPackageRecordModel 预包装记录表领域对象 - */ + // 查询单个预包装记录表 @RequestMapping(value = "/{id}", method = RequestMethod.GET) @Log(actionName = "查询预包装记录表") public BeforehandPackageRecordModel getBeforehandPackageRecordById(@PathVariable(value = "id") String id) { @@ -85,12 +67,7 @@ public class BeforehandPackageRecordController { return beforehandPackageRecordService.getOneBeforehandPackageRecordModel(id); } - /** - * 新增预包装记录表 - * - * @param beforehandPackageRecordModel 新增对象参数 - * @return BeforehandPackageRecordModel 预包装记录表领域对象 - */ + // 新增预包装记录表 @RequestMapping(method = RequestMethod.POST) @Log(actionName = "新增预包装记录表") public BeforehandPackageRecordModel createBeforehandPackageRecord(@RequestBody @Valid BeforehandPackageRecordModel beforehandPackageRecordModel) { @@ -98,12 +75,7 @@ public class BeforehandPackageRecordController { return beforehandPackageRecordService.createBeforehandPackageRecord(beforehandPackageRecordModel); } - /** - * 更新预包装记录表 - * - * @param id 主键 - * @param beforehandPackageRecordModel 更新对象参数 - */ + // 更新预包装记录表 @RequestMapping(value = "/{id}", method = RequestMethod.PUT) @Log(actionName = "更新预包装记录表") public void updateBeforehandPackageRecord(@PathVariable(value = "id") String id, @@ -112,11 +84,7 @@ public class BeforehandPackageRecordController { beforehandPackageRecordService.updateBeforehandPackageRecord(beforehandPackageRecordModel); } - /** - * 删除预包装记录表 - * - * @param id 主键 - */ + // 删除单个预包装记录表 @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @Log(actionName = "删除单个预包装记录表") public void deleteBeforehandPackageRecord(@PathVariable(value = "id") String id) { @@ -124,11 +92,7 @@ public class BeforehandPackageRecordController { beforehandPackageRecordService.deleteBeforehandPackageRecord(id); } - /** - * 删除预包装记录表 - * - * @param ids 主键 - */ + // 批量删除预包装记录表 @RequestMapping(method = RequestMethod.DELETE) @Log(actionName = "批量删除预包装记录表") public void deleteBeforehandPackageRecords(@RequestParam(value = "ids") String[] ids) { diff --git a/src/main/java/com/xmomen/module/beforehandpackagerecord/entity/BeforehandPackageRecord.java b/src/main/java/com/xmomen/module/beforehandpackagerecord/entity/BeforehandPackageRecord.java index 74a56cf..95f4354 100644 --- a/src/main/java/com/xmomen/module/beforehandpackagerecord/entity/BeforehandPackageRecord.java +++ b/src/main/java/com/xmomen/module/beforehandpackagerecord/entity/BeforehandPackageRecord.java @@ -12,39 +12,26 @@ import javax.persistence.Version; @Entity @Table(name = "cd_beforehand_package_record") public class BeforehandPackageRecord extends BaseMybatisModel { - /** - * 主键 - */ + + // 主键id private String id; - /** - * 包装商品 - */ + // cd_item_id private Integer cdItemId; - /** - * 包装商品数 - */ + // 包裹数量 private Integer packageNum; - /** - * 创建时间 - */ + // 插入日期 private Date insertDate; - /** - * 创建人 - */ + // 插入用户id private Integer insertUserId; - /** - * 更新时间 - */ + // 更新日期 private Date updateDate; - /** - * 更新人 - */ + // 更新用户id private Integer updateUserId; @Column(name = "id") diff --git a/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordCreate.java b/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordCreate.java index 37d07db..2a82dd4 100644 --- a/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordCreate.java +++ b/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordCreate.java @@ -9,32 +9,31 @@ import org.springframework.beans.BeanUtils; import java.util.Date; import java.io.Serializable; -/** - * @author tanxinzheng - * @date 2017-5-18 23:36:38 - * @version 1.0.0 - */ + public @Data class BeforehandPackageRecordCreate implements Serializable { - /** */ + // 主键ID private String id; - /** 包装商品 */ + + // 商品ID private Integer cdItemId; - /** 包装商品数 */ + + // 包裹数量 private Integer packageNum; - /** 创建时间 */ + + // 插入日期 private Date insertDate; - /** 创建人 */ + + // 插入用户ID private Integer insertUserId; - /** 更新时间 */ + + // 更新日期 private Date updateDate; - /** 更新人 */ + + // 更新用户ID private Integer updateUserId; - /** - * 获取实体对象 - * @return - */ + // 获取实体对象 public BeforehandPackageRecord getEntity(){ BeforehandPackageRecord beforehandPackageRecord = new BeforehandPackageRecord(); BeanUtils.copyProperties(this, beforehandPackageRecord); diff --git a/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordModel.java b/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordModel.java index aaac5b5..0955c7d 100644 --- a/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordModel.java +++ b/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordModel.java @@ -16,70 +16,59 @@ import java.lang.Integer; import java.util.Date; import java.io.Serializable; -/** - * @author tanxinzheng - * @version 1.0.0 - * @date 2017-5-18 23:36:38 - */ + @ExcelTarget(value = "BeforehandPackageRecordModel") public @Data class BeforehandPackageRecordModel implements Serializable { - /** */ + // id字段，长度限制为32个字符，不能为空 @NotBlank(message = "为必填项") @Length(max = 32, message = "字符长度限制[0,32]") private String id; - /** - * 包装商品 - */ + + // 包装商品，不能为空，数值范围在-999999999到999999999之间 @Excel(name = "包装商品") @NotBlank(message = "包装商品为必填项") @Range(max = 999999999, min = -999999999, message = "包装商品数值范围[999999999,-999999999]") private Integer cdItemId; - /** - * 包装商品数 - */ + + // 包装商品数，不能为空，数值范围在-999999999到999999999之间 @Excel(name = "包装商品数") @NotBlank(message = "包装商品数为必填项") @Range(max = 999999999, min = -999999999, message = "包装商品数数值范围[999999999,-999999999]") private Integer packageNum; - /** - * 创建时间 - */ + + // 创建时间，不能为空 @Excel(name = "创建时间") @NotBlank(message = "创建时间为必填项") private Date insertDate; - /** - * 创建人 - */ + + // 创建人，不能为空，数值范围在-999999999到999999999之间 @Excel(name = "创建人") @NotBlank(message = "创建人为必填项") @Range(max = 999999999, min = -999999999, message = "创建人数值范围[999999999,-999999999]") private Integer insertUserId; - /** - * 更新时间 - */ + + // 更新时间 @Excel(name = "更新时间") private Date updateDate; - /** - * 更新人 - */ + + // 更新人，数值范围在-999999999到999999999之间 @Excel(name = "更新人") @Range(max = 999999999, min = -999999999, message = "更新人数值范围[999999999,-999999999]") private Integer updateUserId; + // 商品编码 private String itemCode; + // 商品名称 private String itemName; + // 包装人 private String packageUserName; - /** - * Get BeforehandPackageRecord Entity Object - * - * @return - */ + // 将BeforehandPackageRecordModel对象转换为BeforehandPackageRecord对象 @JsonIgnore public BeforehandPackageRecord getEntity() { BeforehandPackageRecord beforehandPackageRecord = new BeforehandPackageRecord(); diff --git a/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordQuery.java b/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordQuery.java index 6e52415..7c72c7b 100644 --- a/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordQuery.java +++ b/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordQuery.java @@ -4,30 +4,20 @@ import lombok.Data; import java.io.Serializable; -/** - * @author tanxinzheng - * @version 1.0.0 - * @date 2017-5-18 23:36:38 - */ public @Data class BeforehandPackageRecordQuery implements Serializable { - /** - * 主键 - */ + + // 包记录查询的id private String id; - /** - * 包含主键集 - */ + + // 包记录查询的id数组 private String[] ids; - /** - * 排除主键集 - */ + + // 排除的id数组 private String[] excludeIds; - /** - * 插入用户ID - */ + // 插入用户id private Integer insertUserId; } diff --git a/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordUpdate.java b/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordUpdate.java index e6a3872..4157c4e 100644 --- a/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordUpdate.java +++ b/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordUpdate.java @@ -9,26 +9,28 @@ import org.springframework.beans.BeanUtils; import java.util.Date; import java.io.Serializable; -/** - * @author tanxinzheng - * @date 2017-5-18 23:36:38 - * @version 1.0.0 - */ + public @Data class BeforehandPackageRecordUpdate implements Serializable { - /** */ + // 记录ID private String id; - /** 包装商品 */ + + // CD项ID private Integer cdItemId; - /** 包装商品数 */ + + // 包数量 private Integer packageNum; - /** 创建时间 */ + + // 插入日期 private Date insertDate; - /** 创建人 */ + + // 插入用户ID private Integer insertUserId; - /** 更新时间 */ + + // 更新日期 private Date updateDate; - /** 更新人 */ + + // 更新用户ID private Integer updateUserId; diff --git a/src/main/java/com/xmomen/module/beforehandpackagerecord/service/impl/BeforehandPackageRecordServiceImpl.java b/src/main/java/com/xmomen/module/beforehandpackagerecord/service/impl/BeforehandPackageRecordServiceImpl.java index 3474c68..ef78140 100644 --- a/src/main/java/com/xmomen/module/beforehandpackagerecord/service/impl/BeforehandPackageRecordServiceImpl.java +++ b/src/main/java/com/xmomen/module/beforehandpackagerecord/service/impl/BeforehandPackageRecordServiceImpl.java @@ -20,23 +20,13 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -/** - * @author tanxinzheng - * @date 2017-5-18 23:36:38 - * @version 1.0.0 - */ + @Service public class BeforehandPackageRecordServiceImpl implements BeforehandPackageRecordService { @Autowired MybatisDao mybatisDao; - /** - * 新增预包装记录表 - * - * @param beforehandPackageRecordModel 新增预包装记录表对象参数 - * @return BeforehandPackageRecordModel 预包装记录表领域对象 - */ @Override @Transactional public BeforehandPackageRecordModel createBeforehandPackageRecord(BeforehandPackageRecordModel beforehandPackageRecordModel) { @@ -50,12 +40,6 @@ public class BeforehandPackageRecordServiceImpl implements BeforehandPackageReco return null; } - /** - * 新增预包装记录表实体对象 - * - * @param beforehandPackageRecord 新增预包装记录表实体对象参数 - * @return BeforehandPackageRecord 预包装记录表实体对象 - */ @Override @Transactional public BeforehandPackageRecord createBeforehandPackageRecord(BeforehandPackageRecord beforehandPackageRecord) { @@ -63,12 +47,6 @@ public class BeforehandPackageRecordServiceImpl implements BeforehandPackageReco return mybatisDao.insertByModel(beforehandPackageRecord); } - /** - * 批量新增预包装记录表 - * - * @param beforehandPackageRecordModels 新增预包装记录表对象集合参数 - * @return List 预包装记录表领域对象集合 - */ @Override @Transactional public List createBeforehandPackageRecords(List beforehandPackageRecordModels) { @@ -90,11 +68,7 @@ public class BeforehandPackageRecordServiceImpl implements BeforehandPackageReco return beforehandPackageRecordModelList; } - /** - * 更新预包装记录表 - * - * @param beforehandPackageRecordModel 更新预包装记录表对象参数 - */ + @Override @Transactional public void updateBeforehandPackageRecord(BeforehandPackageRecordModel beforehandPackageRecordModel) { @@ -102,12 +76,6 @@ public class BeforehandPackageRecordServiceImpl implements BeforehandPackageReco mybatisDao.update(beforehandPackageRecordModel.getEntity()); } - /** - * 更新预包装记录表实体对象 - * - * @param beforehandPackageRecord 新增预包装记录表实体对象参数 - * @return BeforehandPackageRecord 预包装记录表实体对象 - */ @Override @Transactional public void updateBeforehandPackageRecord(BeforehandPackageRecord beforehandPackageRecord) { @@ -115,11 +83,6 @@ public class BeforehandPackageRecordServiceImpl implements BeforehandPackageReco mybatisDao.update(beforehandPackageRecord); } - /** - * 删除预包装记录表 - * - * @param ids 主键数组 - */ @Override @Transactional public void deleteBeforehandPackageRecord(String[] ids) { @@ -131,11 +94,7 @@ public class BeforehandPackageRecordServiceImpl implements BeforehandPackageReco mybatisDao.deleteByExample(beforehandPackageRecordExample); } - /** - * 删除预包装记录表 - * - * @param id 主键 - */ + @Override @Transactional public void deleteBeforehandPackageRecord(String id) { @@ -143,74 +102,37 @@ public class BeforehandPackageRecordServiceImpl implements BeforehandPackageReco mybatisDao.deleteByPrimaryKey(BeforehandPackageRecord.class, id); } - /** - * 查询预包装记录表领域分页对象（带参数条件） - * - * @param limit 每页最大数 - * @param offset 页码 - * @param beforehandPackageRecordQuery 查询参数 - * @return Page 预包装记录表参数对象 - */ @Override public Page getBeforehandPackageRecordModelPage(int limit, int offset, BeforehandPackageRecordQuery beforehandPackageRecordQuery) { // 调用mybatisDao的selectPage方法，查询预包装记录表领域分页对象 return (Page) mybatisDao.selectPage(BeforehandPackageRecordMapperExt.BeforehandPackageRecordMapperNameSpace + "getBeforehandPackageRecordModel", beforehandPackageRecordQuery, limit, offset); } - /** - * 查询预包装记录表领域分页对象（无参数条件） - * - * @param limit 每页最大数 - * @param offset 页码 - * @return Page 预包装记录表领域对象 - */ + @Override public Page getBeforehandPackageRecordModelPage(int limit, int offset) { // 调用mybatisDao的selectPage方法，查询预包装记录表领域分页对象 return (Page) mybatisDao.selectPage(BeforehandPackageRecordMapperExt.BeforehandPackageRecordMapperNameSpace + "getBeforehandPackageRecordModel", null, limit, offset); } - /** - * 查询预包装记录表领域集合对象（带参数条件） - * - * @param beforehandPackageRecordQuery 查询参数对象 - * @return List 预包装记录表领域集合对象 - */ @Override public List getBeforehandPackageRecordModelList(BeforehandPackageRecordQuery beforehandPackageRecordQuery) { // 调用mybatisDao的getSqlSessionTemplate的selectList方法，查询预包装记录表领域集合对象 return mybatisDao.getSqlSessionTemplate().selectList(BeforehandPackageRecordMapperExt.BeforehandPackageRecordMapperNameSpace + "getBeforehandPackageRecordModel", beforehandPackageRecordQuery); } - /** - * 查询预包装记录表领域集合对象（无参数条件） - * - * @return List 预包装记录表领域集合对象 - */ @Override public List getBeforehandPackageRecordModelList() { // 调用mybatisDao的getSqlSessionTemplate的selectList方法，查询预包装记录表领域集合对象 return mybatisDao.getSqlSessionTemplate().selectList(BeforehandPackageRecordMapperExt.BeforehandPackageRecordMapperNameSpace + "getBeforehandPackageRecordModel"); } - /** - * 查询预包装记录表实体对象 - * - * @param id 主键 - * @return BeforehandPackageRecord 预包装记录表实体对象 - */ @Override public BeforehandPackageRecord getOneBeforehandPackageRecord(String id) { // 调用mybatisDao的selectByPrimaryKey方法，查询预包装记录表实体对象 return mybatisDao.selectByPrimaryKey(BeforehandPackageRecord.class, id); } - /** - * 根据主键查询单个对象 - * - * @param id 主键 - * @return BeforehandPackageRecordModel 预包装记录表领域对象 - */ @Override public BeforehandPackageRecordModel getOneBeforehandPackageRecordModel(String id) { // 创建预包装记录表查询对象 @@ -221,12 +143,6 @@ public class BeforehandPackageRecordServiceImpl implements BeforehandPackageReco return mybatisDao.getSqlSessionTemplate().selectOne(BeforehandPackageRecordMapperExt.BeforehandPackageRecordMapperNameSpace + "getBeforehandPackageRecordModel", beforehandPackageRecordQuery); } - /** - * 根据查询参数查询单个对象（此方法只用于提供精确查询单个对象，若结果数超过1，则会报错） - * - * @param beforehandPackageRecordQuery 预包装记录表查询参数对象 - * @return BeforehandPackageRecordModel 预包装记录表领域对象 - */ @Override public BeforehandPackageRecordModel getOneBeforehandPackageRecordModel(BeforehandPackageRecordQuery beforehandPackageRecordQuery) throws TooManyResultsException { // 调用mybatisDao的getSqlSessionTemplate的selectOne方法，根据查询参数查询单个对象 diff --git a/src/main/java/com/xmomen/module/common/SysConstant.java b/src/main/java/com/xmomen/module/common/SysConstant.java index 4a04f69..8602179 100644 --- a/src/main/java/com/xmomen/module/common/SysConstant.java +++ b/src/main/java/com/xmomen/module/common/SysConstant.java @@ -1,10 +1,7 @@ package com.xmomen.module.common; -/** - * 系统常量 - * @author Administrator - * - */ + public class SysConstant { + // 定义一个系统常量类 } diff --git a/src/main/java/com/xmomen/module/core/web/JSONResponseBodyAdvice.java b/src/main/java/com/xmomen/module/core/web/JSONResponseBodyAdvice.java index ffc516b..b047ef6 100644 --- a/src/main/java/com/xmomen/module/core/web/JSONResponseBodyAdvice.java +++ b/src/main/java/com/xmomen/module/core/web/JSONResponseBodyAdvice.java @@ -12,38 +12,17 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice; import java.util.HashMap; import java.util.Map; -/** - * Created by Jeng on 2016/1/21. - */ + @Order(1) @ControllerAdvice public class JSONResponseBodyAdvice implements ResponseBodyAdvice { - /** - * Whether this component supports the given controller method return type - * and the selected {@code HttpMessageConverter} type. - * - * @param returnType the return type - * @param converterType the selected converter type - * @return {@code true} if {@link #beforeBodyWrite} should be invoked, {@code false} otherwise - */ + @Override public boolean supports(MethodParameter returnType, Class converterType) { // 判断返回类型是否为Page类型 return returnType.getMethod().getReturnType().isAssignableFrom(Page.class); } - /** - * Invoked after an {@code HttpMessageConverter} is selected and just before - * its write method is invoked. - * - * @param body the body to be written - * @param returnType the return type of the controller method - * @param selectedContentType the content type selected through content negotiation - * @param selectedConverterType the converter type selected to write to the response - * @param request the current request - * @param response the current response - * @return the body that was passed in or a modified, possibly new instance - */ @Override public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType selectedContentType, Class selectedConverterType, ServerHttpRequest request, ServerHttpResponse response) { // 判断返回类型是否为Page类型 diff --git a/src/main/java/com/xmomen/module/core/web/WebCommonUtils.java b/src/main/java/com/xmomen/module/core/web/WebCommonUtils.java index be36689..3757144 100644 --- a/src/main/java/com/xmomen/module/core/web/WebCommonUtils.java +++ b/src/main/java/com/xmomen/module/core/web/WebCommonUtils.java @@ -3,9 +3,7 @@ package com.xmomen.module.core.web; import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; -/** - * Created by Jeng on 2016/3/1. - */ + public class WebCommonUtils { // 判断请求是否为JSON格式 diff --git a/src/main/java/com/xmomen/module/core/web/controller/AccountController.java b/src/main/java/com/xmomen/module/core/web/controller/AccountController.java index 30a48a8..e4222a5 100644 --- a/src/main/java/com/xmomen/module/core/web/controller/AccountController.java +++ b/src/main/java/com/xmomen/module/core/web/controller/AccountController.java @@ -12,9 +12,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -/** - * Created by Jeng on 2016/1/5. - */ + @RestController public class AccountController { @@ -22,10 +20,7 @@ public class AccountController { @Autowired UserService userService; - /** - * 用户设置 - * @return - */ + // 获取账户设置 @RequestMapping(value = "/account/setting", method = RequestMethod.GET) public AccountSettingDto accountSetting(){ // 创建AccountSettingDto对象 @@ -46,10 +41,7 @@ public class AccountController { return accountSettingDto; } - /** - * 用户修改密码 - * @return - */ + // 重置密码 @RequestMapping(value = "/account/resetPassword", method = RequestMethod.POST) public void resetPassword(@RequestParam(value = "current_password") String currentPassword, @RequestParam(value = "password") String password){ diff --git a/src/main/java/com/xmomen/module/core/web/controller/CoreController.java b/src/main/java/com/xmomen/module/core/web/controller/CoreController.java index ee4da83..cad56b2 100644 --- a/src/main/java/com/xmomen/module/core/web/controller/CoreController.java +++ b/src/main/java/com/xmomen/module/core/web/controller/CoreController.java @@ -21,9 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import com.xmomen.module.core.web.controller.dto.RegisterDto; -/** - * Created by Jeng on 2016/1/5. - */ + @Controller public class CoreController { diff --git a/src/main/java/com/xmomen/module/core/web/controller/DmsBaseController.java b/src/main/java/com/xmomen/module/core/web/controller/DmsBaseController.java index 61d3a65..d331320 100644 --- a/src/main/java/com/xmomen/module/core/web/controller/DmsBaseController.java +++ b/src/main/java/com/xmomen/module/core/web/controller/DmsBaseController.java @@ -4,9 +4,7 @@ import com.xmomen.module.base.constant.AppConstants; import org.apache.shiro.SecurityUtils; import org.springframework.web.bind.annotation.RestController; -/** - * Created by tanxinzheng on 17/5/13. - */ + @RestController public class DmsBaseController { diff --git a/src/main/java/com/xmomen/module/core/web/controller/dto/AccountSettingDto.java b/src/main/java/com/xmomen/module/core/web/controller/dto/AccountSettingDto.java index 00f432a..b39ed6a 100644 --- a/src/main/java/com/xmomen/module/core/web/controller/dto/AccountSettingDto.java +++ b/src/main/java/com/xmomen/module/core/web/controller/dto/AccountSettingDto.java @@ -3,9 +3,7 @@ package com.xmomen.module.core.web.controller.dto; import java.io.Serializable; import java.util.List; -/** - * Created by Jeng on 16/1/7. - */ + public class AccountSettingDto implements Serializable { // 用户名 diff --git a/src/main/java/com/xmomen/module/core/web/controller/dto/RegisterDto.java b/src/main/java/com/xmomen/module/core/web/controller/dto/RegisterDto.java index 083098f..c87048f 100644 --- a/src/main/java/com/xmomen/module/core/web/controller/dto/RegisterDto.java +++ b/src/main/java/com/xmomen/module/core/web/controller/dto/RegisterDto.java @@ -5,9 +5,7 @@ import org.hibernate.validator.constraints.NotBlank; import java.io.Serializable; -/** - * Created by Jeng on 2016/1/6. - */ + public class RegisterDto implements Serializable { // 用户名 diff --git a/src/main/java/com/xmomen/module/core/web/exception/DefaultExceptionHandler.java b/src/main/java/com/xmomen/module/core/web/exception/DefaultExceptionHandler.java index a6dd3dd..14fca76 100644 --- a/src/main/java/com/xmomen/module/core/web/exception/DefaultExceptionHandler.java +++ b/src/main/java/com/xmomen/module/core/web/exception/DefaultExceptionHandler.java @@ -8,18 +8,11 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.servlet.ModelAndView; -/** - *

User: Zhang Kaitao - *

Date: 14-2-12 - *

Version: 1.0 - */ + @ControllerAdvice public class DefaultExceptionHandler { - /** - * 没有权限 异常 - *

- * 后续根据不同的需求定制即可 - */ + + // 处理未授权异常 @ExceptionHandler({UnauthorizedException.class}) @ResponseStatus(HttpStatus.UNAUTHORIZED) public ModelAndView processUnauthenticatedException(NativeWebRequest request, UnauthorizedException e) { @@ -33,11 +26,8 @@ public class DefaultExceptionHandler { return mv; } - /** - * 没有权限 异常 - *

- * 后续根据不同的需求定制即可 - */ + + // 处理500内部服务器错误 @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) public ModelAndView internalServerError500Exception(NativeWebRequest request, UnauthorizedException e) { // 创建一个ModelAndView对象 diff --git a/src/main/java/com/xmomen/module/core/web/exception/GlobalMappingExceptionResolver.java b/src/main/java/com/xmomen/module/core/web/exception/GlobalMappingExceptionResolver.java index 7e09304..14f6c53 100644 --- a/src/main/java/com/xmomen/module/core/web/exception/GlobalMappingExceptionResolver.java +++ b/src/main/java/com/xmomen/module/core/web/exception/GlobalMappingExceptionResolver.java @@ -13,9 +13,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -/** - * Created by Jeng on 2016/1/11. - */ + public class GlobalMappingExceptionResolver extends SimpleMappingExceptionResolver { @Override diff --git a/src/main/java/com/xmomen/module/core/web/filter/FormAuthenticationFilterExt.java b/src/main/java/com/xmomen/module/core/web/filter/FormAuthenticationFilterExt.java index a1b1346..6ff6303 100644 --- a/src/main/java/com/xmomen/module/core/web/filter/FormAuthenticationFilterExt.java +++ b/src/main/java/com/xmomen/module/core/web/filter/FormAuthenticationFilterExt.java @@ -28,9 +28,7 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -/** - * Created by Jeng on 2016/1/7. - */ + public class FormAuthenticationFilterExt extends FormAuthenticationFilter { @Autowired diff --git a/src/main/java/com/xmomen/module/core/web/mgt/WebSecurityManagerExt.java b/src/main/java/com/xmomen/module/core/web/mgt/WebSecurityManagerExt.java index aa6ced4..86b9d3e 100644 --- a/src/main/java/com/xmomen/module/core/web/mgt/WebSecurityManagerExt.java +++ b/src/main/java/com/xmomen/module/core/web/mgt/WebSecurityManagerExt.java @@ -13,9 +13,7 @@ import org.apache.shiro.subject.SubjectContext; import org.apache.shiro.web.mgt.DefaultWebSecurityManager; import org.springframework.beans.factory.annotation.Autowired; -/** - * Created by tanxinzheng on 16/7/3. - */ + public class WebSecurityManagerExt extends DefaultWebSecurityManager { @Autowired diff --git a/src/main/java/com/xmomen/module/export/controller/ExportController.java b/src/main/java/com/xmomen/module/export/controller/ExportController.java index 56dabfc..ab2d3ff 100644 --- a/src/main/java/com/xmomen/module/export/controller/ExportController.java +++ b/src/main/java/com/xmomen/module/export/controller/ExportController.java @@ -38,13 +38,6 @@ public class ExportController { @Autowired PurchaseService purchaseService; - /** - * 导出未采购的采购物料 - * - * @param request - * @param response - * @throws IOException - */ @RequestMapping(value = "/export/exportPurchaseExcel") public String exportPurchaseExcel(HttpServletRequest request, HttpServletResponse response, ModelMap modelMap) throws IOException { @@ -67,15 +60,6 @@ public class ExportController { return NormalExcelConstants.JEECG_EXCEL_VIEW; } - /** - * 快递商导出订单信息 - * - * @param request - * @param response - * @param startTime - * @param endTime - * @throws IOException - */ @RequestMapping(value = "/export/exportTakeDeliveryExcel") public String exportTakeDeliveryExcel( HttpServletRequest request, diff --git a/src/main/java/com/xmomen/module/export/model/UploadFileVo.java b/src/main/java/com/xmomen/module/export/model/UploadFileVo.java index 0359edf..cab7abb 100644 --- a/src/main/java/com/xmomen/module/export/model/UploadFileVo.java +++ b/src/main/java/com/xmomen/module/export/model/UploadFileVo.java @@ -6,12 +6,7 @@ import javax.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartHttpServletRequest; -/** - * 上传下载模型类 - * - * @author 张代浩 - * - */ + public class UploadFileVo { private String byteField = "attachmentcontent";// 二进制文件内容保存到数据库的对应实体类字段 private String titleField = "attachmenttitle";// 文件名(标题)保存到数据库的对应实体类字段 @@ -29,10 +24,6 @@ public class UploadFileVo { private HttpServletRequest request; private HttpServletResponse response; - /** - * @param response - * the response to set - */ public void setResponse(HttpServletResponse response) { this.response = response; } @@ -70,51 +61,31 @@ public class UploadFileVo { this.swfpath = swfpath; } - /** - * @return the realPath - */ // 获取realPath public String getRealPath() { return realPath; } - /** - * @param realPath - * the realPath to set - */ // 设置realPath public void setRealPath(String realPath) { this.realPath = realPath; } - /** - * @return the response - */ // 获取response public HttpServletResponse getResponse() { return response; } - /** - * @return the request - */ // 获取request public HttpServletRequest getRequest() { return request; } - /** - * @param request - * the request to set - */ // 设置request public void setRequest(HttpServletRequest request) { this.request = request; } - /** - * @return the multipartRequest - */ // 获取multipartRequest public MultipartHttpServletRequest getMultipartRequest() { return multipartRequest; @@ -126,10 +97,6 @@ public class UploadFileVo { } - /** - * @param multipartRequest - * the multipartRequest to set - */ // 设置multipartRequest public void setMultipartRequest(MultipartHttpServletRequest multipartRequest) { this.multipartRequest = multipartRequest; diff --git a/src/main/java/com/xmomen/module/export/service/ExportService.java b/src/main/java/com/xmomen/module/export/service/ExportService.java index a255644..2ce438f 100644 --- a/src/main/java/com/xmomen/module/export/service/ExportService.java +++ b/src/main/java/com/xmomen/module/export/service/ExportService.java @@ -28,11 +28,8 @@ public class ExportService { PurchaseService purchaseService; @Autowired ExpressService expressService; - /** - * 采购单导出 - * @param templatePath - * @return - */ + + // 导出采购单Excel public XSSFWorkbook exportPurchaseExcel(String templatePath){ XSSFWorkbook workbook = new XSSFWorkbook(); ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream(); @@ -76,12 +73,8 @@ public class ExportService { return workbook; } - /** - * 快速商导出订单 - * @param templatePath - * @param query - * @return - */ + + // 导出取货单Excel public XSSFWorkbook exportTakeDeliveryExcel(String templatePath,OrderQuery query){ XSSFWorkbook workbook = new XSSFWorkbook(); ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream(); diff --git a/src/main/java/com/xmomen/module/export/util/PrintUtils.java b/src/main/java/com/xmomen/module/export/util/PrintUtils.java index c1f922f..b39d49c 100644 --- a/src/main/java/com/xmomen/module/export/util/PrintUtils.java +++ b/src/main/java/com/xmomen/module/export/util/PrintUtils.java @@ -20,14 +20,8 @@ import com.xmomen.module.export.model.UploadFileVo; public class PrintUtils { - - /** - * 导出Excel文件 - * - * @param response - * @param workbook - * @param outPutFileName - */ + + // 导出Excel文件 public static void excelResponseOutput(HttpServletResponse response, HSSFWorkbook workbook, String outPutFileName) { try{ // 重置response @@ -49,14 +43,8 @@ public class PrintUtils { e.printStackTrace(); } } - - /** - * 导出Excel文件 - * - * @param response - * @param workbook - * @param outPutFileName - */ + + // 导出Excel文件 public static void excelResponseOutput(HttpServletResponse response, XSSFWorkbook workbook, String outPutFileName) { try{ // 重置response @@ -78,14 +66,8 @@ public class PrintUtils { e.printStackTrace(); } } - - /** - * 导出标签文件 - * - * @param response - * @param workbook - * @param outPutFileName - */ + + // 导出标签文件 public static void labelResponseOutput(HttpServletResponse response, HSSFWorkbook workbook, String outPutFileName) { try{ // 重置response @@ -107,14 +89,8 @@ public class PrintUtils { e.printStackTrace(); } } - - /** - * 导出标签文件 - * - * @param response - * @param workbook - * @param outPutFileName - */ + + // 导出标签文件 public static void labelResponseOutput(HttpServletResponse response, XSSFWorkbook workbook, String outPutFileName) { try{ // 重置response @@ -138,13 +114,7 @@ public class PrintUtils { } - /** - * 文件下载 - * - * @param uploadFile - * @throws Exception - * @throws Exception - */ + @SuppressWarnings("unchecked") public static HttpServletResponse viewOrDownloadFile(UploadFileVo uploadFile) { // 设置response的编码 diff --git a/src/main/java/com/xmomen/module/job/controller/JobOperationLogController.java b/src/main/java/com/xmomen/module/job/controller/JobOperationLogController.java index 47af3a2..ab42b01 100644 --- a/src/main/java/com/xmomen/module/job/controller/JobOperationLogController.java +++ b/src/main/java/com/xmomen/module/job/controller/JobOperationLogController.java @@ -26,8 +26,7 @@ import com.xmomen.module.job.model.JobOperationLogModel; import com.xmomen.module.job.service.JobOperationLogService; import com.xmomen.module.logger.Log; -/** - */ + @RestController public class JobOperationLogController { @@ -37,13 +36,8 @@ public class JobOperationLogController { @Autowired MybatisDao mybatisDao; - /** - * 查看包装操作记录 - * @param limit - * @param offset - * @param keyword - * @return - */ + + // 根据参数查询包装操作记录 @RequestMapping(value = "/jobOperationLog", method = RequestMethod.GET) @Log(actionName = "查看包装操作记录") public Page getUserList(@RequestParam(value = "limit") Integer limit, @@ -58,10 +52,7 @@ public class JobOperationLogController { return (Page) mybatisDao.selectPage(JobOperationLogMapper.JobOperationLogMapperNameSpace + "getJobOperationLogList", param, limit, offset); } - /** - * 删除包装操作记录 - * @param id - */ + // 根据id删除包装操作记录 @RequestMapping(value = "/jobOperationLog/{id}", method = RequestMethod.DELETE) @Log(actionName = "包装操作记录") public void deletePlan(@PathVariable(value = "id") Integer id){ diff --git a/src/main/java/com/xmomen/module/job/controller/PackageTaskController.java b/src/main/java/com/xmomen/module/job/controller/PackageTaskController.java index ef08165..0f557ac 100644 --- a/src/main/java/com/xmomen/module/job/controller/PackageTaskController.java +++ b/src/main/java/com/xmomen/module/job/controller/PackageTaskController.java @@ -27,8 +27,7 @@ import com.xmomen.module.job.model.PackageTaskModel; import com.xmomen.module.job.service.PackageTaskService; import com.xmomen.module.logger.Log; -/** - */ + @RestController public class PackageTaskController { @@ -38,13 +37,7 @@ public class PackageTaskController { @Autowired MybatisDao mybatisDao; - /** - * 包装任务 - * @param limit - * @param offset - * @param keyword - * @return - */ + @RequestMapping(value = "/packageTask", method = RequestMethod.GET) @Log(actionName = "查询包装任务") public Page getUserList(@RequestParam(value = "limit") Integer limit, @@ -79,13 +72,9 @@ public class PackageTaskController { return packageTasks; } - /** - * 新增包装任务 - * @param createPurchase - * @param bindingResult - * @return - */ + @RequestMapping(value = "/packageTask", method = RequestMethod.POST) + // 新增包装任务 @Log(actionName = "新增包装任务") public void packageTask(@RequestBody @Valid CreatePackageTask createPackageTask, BindingResult bindingResult) throws ArgumentValidException { if(bindingResult != null && bindingResult.hasErrors()){ diff --git a/src/main/java/com/xmomen/module/job/entity/TbJob.java b/src/main/java/com/xmomen/module/job/entity/TbJob.java index 0eebd6f..922f2dd 100644 --- a/src/main/java/com/xmomen/module/job/entity/TbJob.java +++ b/src/main/java/com/xmomen/module/job/entity/TbJob.java @@ -12,69 +12,44 @@ import javax.persistence.Version; @Entity @Table(name = "tb_job") public class TbJob extends BaseMybatisModel { - /** - * - */ + + // 任务ID private Integer id; - /** - * 采购编号 - */ + // 采购单号 private String purchaseCode; - /** - * 采购明细ID - */ + // 采购ID private Integer purchaseId; - /** - * 1-包装任务，2-装箱任务 - */ + // 任务类型 private Integer jobType; - /** - * 0-未开始，1-包装中，2-包装完成 - */ + // 任务状态 private Integer jobStatus; - /** - * - */ + // 任务用户 private Integer jobUser; - /** - * 任务创建时间 - */ + // 任务创建时间 private Date jobCreateTime; - /** - * 包装的产品 - */ + // CD项ID private Integer cdItemId; - /** - * 需要包装的份数 - */ + // 计数值 private Integer countValue; - /** - * 任务开始时间 - */ + // 任务开始时间 private Date jobBeginTime; - /** - * 包装完成的份数 - */ + // 完成值 private Integer finishValue; - /** - * - */ + // 完成时间 private Date finishTime; - /** - * 任务创建人 - */ + // 任务创建用户 private Integer jobCreateUser; @Column(name = "id") diff --git a/src/main/java/com/xmomen/module/job/entity/TbJobOperationLog.java b/src/main/java/com/xmomen/module/job/entity/TbJobOperationLog.java index 4f82d05..c414b21 100644 --- a/src/main/java/com/xmomen/module/job/entity/TbJobOperationLog.java +++ b/src/main/java/com/xmomen/module/job/entity/TbJobOperationLog.java @@ -12,34 +12,23 @@ import javax.persistence.Version; @Entity @Table(name = "tb_job_operation_log") public class TbJobOperationLog extends BaseMybatisModel { - /** - * 主键 - */ + + // 主键id private Integer id; - /** - * 工作ID - */ + // 任务id private Integer jobId; - /** - * 操作人 - */ + // 任务用户 private Integer jobUser; - /** - * 操作时间 - */ + // 任务时间 private Date jobTime; - /** - * 操作的条码 - */ + // 条形码 private String barCode; - /** - * 操作的商品条码 - */ + // 商品编码 private String itemCode; @Column(name = "id") diff --git a/src/main/java/com/xmomen/module/job/model/CreateJobOperationLog.java b/src/main/java/com/xmomen/module/job/model/CreateJobOperationLog.java index ee1f99d..97f5d77 100644 --- a/src/main/java/com/xmomen/module/job/model/CreateJobOperationLog.java +++ b/src/main/java/com/xmomen/module/job/model/CreateJobOperationLog.java @@ -6,13 +6,11 @@ import java.util.Date; import lombok.Data; public @Data class CreateJobOperationLog implements Serializable{ - /** - * 操作的条码 - */ + + // 条形码 private String barCode; - /** - * 操作的商品条码 - */ + + // 物品编码 private String itemCode; } diff --git a/src/main/java/com/xmomen/module/job/model/CreatePackageTask.java b/src/main/java/com/xmomen/module/job/model/CreatePackageTask.java index 6d41d1d..893b841 100644 --- a/src/main/java/com/xmomen/module/job/model/CreatePackageTask.java +++ b/src/main/java/com/xmomen/module/job/model/CreatePackageTask.java @@ -5,59 +5,37 @@ import java.util.Date; public class CreatePackageTask implements Serializable{ - /** - * 采购编号 - */ + // 购买代码 private String purchaseCode; - /** - * 采购明细ID - */ + // 购买ID private Integer purchaseId; - /** - * 1-包装任务，2-装箱任务 - */ + // 任务类型 private Integer jobType; - /** - * 0-未开始，1-包装中，2-包装完成 - */ + // 任务状态 private Integer jobStatus; - /** - * - */ + // 任务用户 private Integer jobUser; - /** - * 任务创建时间 - */ + // 任务创建时间 private Date jobCreateTime; - /** - * 包装的产品 - */ + // CD项ID private Integer cdItemId; - /** - * 需要包装的份数 - */ + // 计数值 private Integer countValue; - /** - * 包装完成的份数 - */ + // 完成值 private Integer finishValue; - /** - * - */ + // 完成时间 private Date finishTime; - /** - * 任务创建人 - */ + // 任务创建用户 private Integer jobCreateUser; public String getPurchaseCode() { diff --git a/src/main/java/com/xmomen/module/job/model/JobOperationLogModel.java b/src/main/java/com/xmomen/module/job/model/JobOperationLogModel.java index 32f590b..e071392 100644 --- a/src/main/java/com/xmomen/module/job/model/JobOperationLogModel.java +++ b/src/main/java/com/xmomen/module/job/model/JobOperationLogModel.java @@ -8,36 +8,25 @@ import lombok.Data; public @Data class JobOperationLogModel implements Serializable{ // 操作日志ID private Integer id; - /** - * 操作的条码 - */ + + // 条形码 private String barCode; - /** - * 操作的商品条码 - */ + + // 物料编码 private String itemCode; + // 物料名称 private String itemName; - - /** - * 采摘人 - */ + + // 质检员 private String caizaiUser; - /** - * 检测人 - */ + // 检测员 private String jianceUser; - - - /** - * 农残率 - */ - private String nongCanLv; + // 农残率 + private String nongCanLv; - /** - * 生产地 - */ + // 产量 private String yieldly; } diff --git a/src/main/java/com/xmomen/module/job/model/PackageTaskModel.java b/src/main/java/com/xmomen/module/job/model/PackageTaskModel.java index c9f791b..0675c99 100644 --- a/src/main/java/com/xmomen/module/job/model/PackageTaskModel.java +++ b/src/main/java/com/xmomen/module/job/model/PackageTaskModel.java @@ -4,105 +4,73 @@ import java.io.Serializable; import java.util.Date; public class PackageTaskModel implements Serializable { - /** - * - */ + private Integer id; - /** - * 采购编号 - */ + // 采购编号 private String purchaseCode; - /** - * 采购明细ID - */ + // 采购明细ID private Integer purchaseId; - /** - * 1-包装任务，2-装箱任务 - */ + // 任务类型 private Integer jobType; - /** - * 0-未开始，1-包装中，2-包装完成 - */ + // 任务状态 private Integer jobStatus; - /** - * - */ + // 任务执行人 private Integer jobUser; - /** - * 任务创建时间 - */ + // 任务创建时间 private Date jobCreateTime; - - /** - * 任务开始时间 - */ + // 任务开始时间 private Date jobBeginTime; - - /** - * 包装的产品 - */ + // 包装的产品 private Integer cdItemId; - /** - * 销售单位 - */ + // 销售单位 private String sellUnit; - /** - * 需要包装的份数 - */ + // 需要包装的份数 private Integer countValue; - /** - * 包装完成的份数 - */ + // 包装完成的份数 private Integer finishValue; + // 未完成的份数 private Integer noFinishValue; - /** - * - */ + + // 任务完成时间 private Date finishTime; - /** - * 任务创建人 - */ + // 任务创建人 private Integer jobCreateUser; + // 商品编码 private String itemCode; + // 商品名称 private String itemName; + // 任务执行人名称 private String jobUserName; + // 商品规格 private String spec; - /** - * 采摘人 - */ + // 采摘人 private String caizaiUser; - /** - * 检测人 - */ + // 检测人 private String jianceUser; - /** - * 农残率 - */ + // 农残率 private String nongCanLv; - /** - * 生产地 - */ + // 生产地 private String yieldly; // 获取商品编码 diff --git a/src/main/java/com/xmomen/module/job/model/UpdateJobOperationLog.java b/src/main/java/com/xmomen/module/job/model/UpdateJobOperationLog.java index ac38bb9..fc6a282 100644 --- a/src/main/java/com/xmomen/module/job/model/UpdateJobOperationLog.java +++ b/src/main/java/com/xmomen/module/job/model/UpdateJobOperationLog.java @@ -6,13 +6,11 @@ import java.util.Date; import lombok.Data; public @Data class UpdateJobOperationLog implements Serializable{ - /** - * 操作的条码 - */ + + // 条形码 private String barCode; - /** - * 操作的商品条码 - */ + + // 商品编码 private String itemCode; } diff --git a/src/main/java/com/xmomen/module/job/model/UpdatePackageTask.java b/src/main/java/com/xmomen/module/job/model/UpdatePackageTask.java index 0fa2e13..42ca6fe 100644 --- a/src/main/java/com/xmomen/module/job/model/UpdatePackageTask.java +++ b/src/main/java/com/xmomen/module/job/model/UpdatePackageTask.java @@ -4,59 +4,38 @@ import java.io.Serializable; import java.util.Date; public class UpdatePackageTask implements Serializable{ - /** - * 采购编号 - */ + + // 购买代码 private String purchaseCode; - /** - * 采购明细ID - */ + // 购买ID private Integer purchaseId; - /** - * 1-包装任务，2-装箱任务 - */ + // 任务类型 private Integer jobType; - /** - * 0-未开始，1-包装中，2-包装完成 - */ + // 任务状态 private Integer jobStatus; - /** - * - */ + // 任务用户 private Integer jobUser; - /** - * 任务创建时间 - */ + // 任务创建时间 private Date jobCreateTime; - /** - * 包装的产品 - */ + // CD项ID private Integer cdItemId; - /** - * 需要包装的份数 - */ + // 计数值 private Integer countValue; - /** - * 包装完成的份数 - */ + // 完成值 private Integer finishValue; - /** - * - */ + // 完成时间 private Date finishTime; - /** - * 任务创建人 - */ + // 任务创建用户 private Integer jobCreateUser; public String getPurchaseCode() { diff --git a/src/main/java/com/xmomen/module/member/controller/MemberAddressController.java b/src/main/java/com/xmomen/module/member/controller/MemberAddressController.java index 0cc6d86..30bab41 100644 --- a/src/main/java/com/xmomen/module/member/controller/MemberAddressController.java +++ b/src/main/java/com/xmomen/module/member/controller/MemberAddressController.java @@ -29,28 +29,16 @@ import java.io.IOException; import java.io.InputStream; import java.util.List; -/** - * @author tanxinzheng - * @version 1.0.0 - * @date 2017-3-29 0:27:52 - */ + @RestController @RequestMapping(value = "/memberAddress") public class MemberAddressController { + // 自动注入MemberAddressService @Autowired MemberAddressService memberAddressService; - /** - * 客户地址列表 - * - * @param limit 每页结果数 - * @param offset 页码 - * @param id 主键 - * @param ids 主键数组 - * @param excludeIds 不包含主键数组 - * @return Page 客户地址领域分页对象 - */ + // 查询客户地址列表 @RequestMapping(method = RequestMethod.GET) @Log(actionName = "查询客户地址列表") public Page getMemberAddressList(@RequestParam(value = "limit") Integer limit, @@ -59,72 +47,59 @@ public class MemberAddressController { @RequestParam(value = "ids", required = false) String[] ids, @RequestParam(value = "cdMemberId", required = false) String cdMemberId, @RequestParam(value = "excludeIds", required = false) String[] excludeIds) { + // 创建MemberAddressQuery对象 MemberAddressQuery memberAddressQuery = new MemberAddressQuery(); + // 设置查询条件 memberAddressQuery.setId(id); memberAddressQuery.setExcludeIds(excludeIds); memberAddressQuery.setIds(ids); memberAddressQuery.setCdMemberId(cdMemberId); + // 调用MemberAddressService的getMemberAddressModelPage方法查询客户地址列表 return memberAddressService.getMemberAddressModelPage(limit, offset, memberAddressQuery); } - /** - * 查询单个客户地址 - * - * @param id 主键 - * @return MemberAddressModel 客户地址领域对象 - */ + // 查询客户地址 @RequestMapping(value = "/{id}", method = RequestMethod.GET) @Log(actionName = "查询客户地址") public MemberAddressModel getMemberAddressById(@PathVariable(value = "id") String id) { + // 调用MemberAddressService的getOneMemberAddressModel方法查询客户地址 return memberAddressService.getOneMemberAddressModel(id); } - /** - * 新增客户地址 - * - * @param memberAddressModel 新增对象参数 - * @return MemberAddressModel 客户地址领域对象 - */ + // 新增客户地址 @RequestMapping(method = RequestMethod.POST) @Log(actionName = "新增客户地址") public MemberAddressModel createMemberAddress(@RequestBody @Valid MemberAddressModel memberAddressModel) { + // 获取当前用户ID Integer userId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY); + // 设置客户ID memberAddressModel.setCdMemberId(userId); + // 调用MemberAddressService的createMemberAddress方法新增客户地址 return memberAddressService.createMemberAddress(memberAddressModel); } - /** - * 更新客户地址 - * - * @param id 主键 - * @param memberAddressModel 更新对象参数 - */ + // 更新客户地址 @RequestMapping(value = "/{id}", method = RequestMethod.PUT) @Log(actionName = "更新客户地址") public void updateMemberAddress(@PathVariable(value = "id") String id, @RequestBody @Valid MemberAddressModel memberAddressModel) { + // 调用MemberAddressService的updateMemberAddress方法更新客户地址 memberAddressService.updateMemberAddress(memberAddressModel); } - /** - * 删除客户地址 - * - * @param id 主键 - */ + // 删除单个客户地址 @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @Log(actionName = "删除单个客户地址") public void deleteMemberAddress(@PathVariable(value = "id") String id) { + // 调用MemberAddressService的deleteMemberAddress方法删除客户地址 memberAddressService.deleteMemberAddress(id); } - /** - * 删除客户地址 - * - * @param ids 主键 - */ + // 批量删除客户地址 @RequestMapping(method = RequestMethod.DELETE) @Log(actionName = "批量删除客户地址") public void deleteMemberAddresss(@RequestParam(value = "ids") String[] ids) { + // 调用MemberAddressService的deleteMemberAddress方法批量删除客户地址 memberAddressService.deleteMemberAddress(ids); } diff --git a/src/main/java/com/xmomen/module/member/entity/MemberAddress.java b/src/main/java/com/xmomen/module/member/entity/MemberAddress.java index 26934c4..8813fe1 100644 --- a/src/main/java/com/xmomen/module/member/entity/MemberAddress.java +++ b/src/main/java/com/xmomen/module/member/entity/MemberAddress.java @@ -11,54 +11,35 @@ import javax.persistence.Version; @Entity @Table(name = "cd_member_address") public class MemberAddress extends BaseMybatisModel { - /** - * - */ + + // 主键id private String id; - /** - * 客户ID - */ + // 会员id private Integer cdMemberId; - /** - * - */ + // 省份 private Integer province; - /** - * 城市 - */ + // 城市 private Integer city; - /** - * 区域 - */ + // 区域 private Integer area; - /** - * 详细地址 - */ + // 详细地址 private String address; - /** - * 完整地址 - */ + // 完整地址 private String fullAddress; - /** - * - */ + // 姓名 private String name; - /** - * - */ + // 手机号 private String mobile; - /** - * 是否默认地址 - */ + // 是否默认地址 private Boolean isDefault; @Column(name = "id") diff --git a/src/main/java/com/xmomen/module/member/model/MemberAddressCreate.java b/src/main/java/com/xmomen/module/member/model/MemberAddressCreate.java index b3ce2bd..ba20533 100644 --- a/src/main/java/com/xmomen/module/member/model/MemberAddressCreate.java +++ b/src/main/java/com/xmomen/module/member/model/MemberAddressCreate.java @@ -9,32 +9,37 @@ import org.springframework.beans.BeanUtils; import java.lang.Integer; import java.io.Serializable; -/** - * @author tanxinzheng - * @date 2017-4-10 23:05:38 - * @version 1.0.0 - */ + public @Data class MemberAddressCreate implements Serializable { - /** */ + // 会员地址ID private String id; - /** 客户ID */ + + // 会员ID private Integer cdMemberId; - /** */ + + // 省份 private Integer province; - /** 城市 */ + + // 城市 private Integer city; - /** 区域 */ + + // 区域 private Integer area; - /** 详细地址 */ + + // 详细地址 private String address; - /** 完整地址 */ + + // 完整地址 private String fullAddress; - /** */ + + // 姓名 private String name; - /** */ + + // 手机号 private String mobile; - /** 是否默认地址 */ + + // 是否默认地址 private boolean isDefault; // 将MemberAddressCreate对象转换为MemberAddress对象 diff --git a/src/main/java/com/xmomen/module/member/model/MemberAddressModel.java b/src/main/java/com/xmomen/module/member/model/MemberAddressModel.java index b847c53..049b144 100644 --- a/src/main/java/com/xmomen/module/member/model/MemberAddressModel.java +++ b/src/main/java/com/xmomen/module/member/model/MemberAddressModel.java @@ -13,65 +13,56 @@ import java.lang.Integer; import java.lang.String; import java.io.Serializable; -/** - * @author tanxinzheng - * @date 2017-3-28 12:53:37 - * @version 1.0.0 - */ + @ExcelTarget(value = "MemberAddressModel") public @Data class MemberAddressModel implements Serializable { - /** */ // @NotBlank(message = "为必填项") @Length(max = 32, message = "字符长度限制[0,32]") private String id; - /** 客户ID */ + @Excel(name = "客户ID") @NotNull(message = "客户ID为必填项") @Range(max = 999999999, min = -999999999, message = "客户ID数值范围[999999999,-999999999]") private Integer cdMemberId; - /** */ + @Excel(name = "") @Range(max = 999999999, min = -999999999, message = "数值范围[999999999,-999999999]") private Integer province; - /** 城市 */ + @Excel(name = "城市") @Range(max = 999999999, min = -999999999, message = "城市数值范围[999999999,-999999999]") private Integer city; - /** 区域 */ + @Excel(name = "区域") @Range(max = 999999999, min = -999999999, message = "区域数值范围[999999999,-999999999]") private Integer area; - /** 详细地址 */ + @Excel(name = "详细地址") @NotBlank(message = "详细地址为必填项") @Length(max = 256, message = "详细地址字符长度限制[0,256]") private String address; - /** 完整地址 */ + @Excel(name = "完整地址") @NotBlank(message = "完整地址为必填项") @Length(max = 256, message = "完整地址字符长度限制[0,256]") private String fullAddress; - /** */ + @Excel(name = "") @NotBlank(message = "为必填项") @Length(max = 32, message = "字符长度限制[0,32]") private String name; - /** */ + @Excel(name = "") @NotBlank(message = "为必填项") @Length(max = 32, message = "字符长度限制[0,32]") private String mobile; - /** 是否默认地址 */ + @Excel(name = "是否默认地址") // @Range(max = 999999999, min = -999999999, message = "是否默认地址数值范围[999999999,-999999999]") //@NotBlank(message = "是否默认地址为必填项") private Boolean isDefault; - /** - * Get MemberAddress Entity Object - * @return - */ @JsonIgnore public MemberAddress getEntity(){ MemberAddress memberAddress = new MemberAddress(); diff --git a/src/main/java/com/xmomen/module/member/model/MemberAddressQuery.java b/src/main/java/com/xmomen/module/member/model/MemberAddressQuery.java index 9039178..246ce03 100644 --- a/src/main/java/com/xmomen/module/member/model/MemberAddressQuery.java +++ b/src/main/java/com/xmomen/module/member/model/MemberAddressQuery.java @@ -4,30 +4,21 @@ import lombok.Data; import java.io.Serializable; -/** - * @author tanxinzheng - * @version 1.0.0 - * @date 2017-3-29 0:27:52 - */ + public @Data class MemberAddressQuery implements Serializable { - /** - * 主键 - */ + + // 会员地址查询类 private String id; - /** - * 包含主键集 - */ + + // 会员地址查询类 private String[] ids; - /** - * 排除主键集 - */ + + // 会员地址查询类 private String[] excludeIds; - /** - * 会员ID - */ + // 会员地址查询类 private String cdMemberId; } diff --git a/src/main/java/com/xmomen/module/member/model/MemberAddressUpdate.java b/src/main/java/com/xmomen/module/member/model/MemberAddressUpdate.java index b865cae..c3191b7 100644 --- a/src/main/java/com/xmomen/module/member/model/MemberAddressUpdate.java +++ b/src/main/java/com/xmomen/module/member/model/MemberAddressUpdate.java @@ -9,32 +9,37 @@ import org.springframework.beans.BeanUtils; import java.lang.Integer; import java.io.Serializable; -/** - * @author tanxinzheng - * @date 2017-4-10 23:05:39 - * @version 1.0.0 - */ + public @Data class MemberAddressUpdate implements Serializable { - /** */ + // 会员地址ID private String id; - /** 客户ID */ + + // 会员ID private Integer cdMemberId; - /** */ + + // 省份 private Integer province; - /** 城市 */ + + // 城市 private Integer city; - /** 区域 */ + + // 区域 private Integer area; - /** 详细地址 */ + + // 详细地址 private String address; - /** 完整地址 */ + + // 完整地址 private String fullAddress; - /** */ + + // 姓名 private String name; - /** */ + + // 手机号 private String mobile; - /** 是否默认地址 */ + + // 是否默认地址 private Boolean isDefault; diff --git a/src/main/java/com/xmomen/module/member/service/impl/MemberAddressServiceImpl.java b/src/main/java/com/xmomen/module/member/service/impl/MemberAddressServiceImpl.java index b9c8149..da3e90d 100644 --- a/src/main/java/com/xmomen/module/member/service/impl/MemberAddressServiceImpl.java +++ b/src/main/java/com/xmomen/module/member/service/impl/MemberAddressServiceImpl.java @@ -19,23 +19,15 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -/** - * @author tanxinzheng - * @version 1.0.0 - * @date 2017-3-29 0:27:52 - */ + @Service public class MemberAddressServiceImpl implements MemberAddressService { + //注入MybatisDao @Autowired MybatisDao mybatisDao; - /** - * 新增客户地址 - * - * @param memberAddressModel 新增客户地址对象参数 - * @return MemberAddressModel 客户地址领域对象 - */ + //创建会员地址 @Override @Transactional public MemberAddressModel createMemberAddress(MemberAddressModel memberAddressModel) { @@ -46,27 +38,18 @@ public class MemberAddressServiceImpl implements MemberAddressService { return null; } - /** - * 新增客户地址实体对象 - * - * @param memberAddress 新增客户地址实体对象参数 - * @return MemberAddress 客户地址实体对象 - */ + //创建会员地址 @Override @Transactional public MemberAddress createMemberAddress(MemberAddress memberAddress) { + //如果地址id为空，则生成一个新的id if (StringUtils.trimToNull(memberAddress.getId()) == null) { memberAddress.setId(StringUtilsExt.getUUID(32)); } return mybatisDao.insertByModel(memberAddress); } - /** - * 批量新增客户地址 - * - * @param memberAddressModels 新增客户地址对象集合参数 - * @return List 客户地址领域对象集合 - */ + //批量创建会员地址 @Override @Transactional public List createMemberAddresss(List memberAddressModels) { @@ -83,34 +66,21 @@ public class MemberAddressServiceImpl implements MemberAddressService { return memberAddressModelList; } - /** - * 更新客户地址 - * - * @param memberAddressModel 更新客户地址对象参数 - */ + //更新会员地址 @Override @Transactional public void updateMemberAddress(MemberAddressModel memberAddressModel) { mybatisDao.update(memberAddressModel.getEntity()); } - /** - * 更新客户地址实体对象 - * - * @param memberAddress 新增客户地址实体对象参数 - * @return MemberAddress 客户地址实体对象 - */ + //更新会员地址 @Override @Transactional public void updateMemberAddress(MemberAddress memberAddress) { mybatisDao.update(memberAddress); } - /** - * 删除客户地址 - * - * @param ids 主键数组 - */ + //删除会员地址 @Override @Transactional public void deleteMemberAddress(String[] ids) { @@ -119,80 +89,44 @@ public class MemberAddressServiceImpl implements MemberAddressService { mybatisDao.deleteByExample(memberAddressExample); } - /** - * 删除客户地址 - * - * @param id 主键 - */ + //删除会员地址 @Override @Transactional public void deleteMemberAddress(String id) { mybatisDao.deleteByPrimaryKey(MemberAddress.class, id); } - /** - * 查询客户地址领域分页对象（带参数条件） - * - * @param limit 每页最大数 - * @param offset 页码 - * @param memberAddressQuery 查询参数 - * @return Page 客户地址参数对象 - */ + //分页查询会员地址 @Override public Page getMemberAddressModelPage(int limit, int offset, MemberAddressQuery memberAddressQuery) { return (Page) mybatisDao.selectPage(MemberAddressMapperExt.MemberAddressMapperNameSpace + "getMemberAddressModel", memberAddressQuery, limit, offset); } - /** - * 查询客户地址领域分页对象（无参数条件） - * - * @param limit 每页最大数 - * @param offset 页码 - * @return Page 客户地址领域对象 - */ + //分页查询会员地址 @Override public Page getMemberAddressModelPage(int limit, int offset) { return (Page) mybatisDao.selectPage(MemberAddressMapperExt.MemberAddressMapperNameSpace + "getMemberAddressModel", null, limit, offset); } - /** - * 查询客户地址领域集合对象（带参数条件） - * - * @param memberAddressQuery 查询参数对象 - * @return List 客户地址领域集合对象 - */ + //查询会员地址列表 @Override public List getMemberAddressModelList(MemberAddressQuery memberAddressQuery) { return mybatisDao.getSqlSessionTemplate().selectList(MemberAddressMapperExt.MemberAddressMapperNameSpace + "getMemberAddressModel", memberAddressQuery); } - /** - * 查询客户地址领域集合对象（无参数条件） - * - * @return List 客户地址领域集合对象 - */ + //查询会员地址列表 @Override public List getMemberAddressModelList() { return mybatisDao.getSqlSessionTemplate().selectList(MemberAddressMapperExt.MemberAddressMapperNameSpace + "getMemberAddressModel"); } - /** - * 查询客户地址实体对象 - * - * @param id 主键 - * @return MemberAddress 客户地址实体对象 - */ + //根据id查询会员地址 @Override public MemberAddress getOneMemberAddress(String id) { return mybatisDao.selectByPrimaryKey(MemberAddress.class, id); } - /** - * 根据主键查询单个对象 - * - * @param id 主键 - * @return MemberAddressModel 客户地址领域对象 - */ + //根据id查询会员地址 @Override public MemberAddressModel getOneMemberAddressModel(String id) { MemberAddressQuery memberAddressQuery = new MemberAddressQuery(); @@ -200,22 +134,13 @@ public class MemberAddressServiceImpl implements MemberAddressService { return mybatisDao.getSqlSessionTemplate().selectOne(MemberAddressMapperExt.MemberAddressMapperNameSpace + "getMemberAddressModel", memberAddressQuery); } - /** - * 根据查询参数查询单个对象（此方法只用于提供精确查询单个对象，若结果数超过1，则会报错） - * - * @param memberAddressQuery 客户地址查询参数对象 - * @return MemberAddressModel 客户地址领域对象 - */ + //根据查询条件查询会员地址 @Override public MemberAddressModel getOneMemberAddressModel(MemberAddressQuery memberAddressQuery) throws TooManyResultsException { return mybatisDao.getSqlSessionTemplate().selectOne(MemberAddressMapperExt.MemberAddressMapperNameSpace + "getMemberAddressModel", memberAddressQuery); } - /** - * 设置默认收货地址 - * - * @param addressId 收货地址 - */ + //设置默认地址 public void defaultAddress(String addressId) { MemberAddress memberAddress = this.getOneMemberAddress(addressId); //将收货地址全部更新为非默认 @@ -224,6 +149,7 @@ public class MemberAddressServiceImpl implements MemberAddressService { this.mybatisDao.updateByModel(memberAddress); } + //根据查询条件查询会员地址列表 @Override public List getMemberAddressModels(MemberAddressQuery memberAddressQuery) { return mybatisDao.getSqlSessionTemplate().selectList(MemberAddressMapperExt.MemberAddressMapperNameSpace + "getMemberAddressModel", memberAddressQuery);