Commit 5960f7a7fb2cbd85c409e3a0288aad51d9b4afad
1 parent
6b1ad920
订单分析迁移,订单分析结果
Showing
13 changed files
with
120 additions
and
33 deletions
src/main/java/com/huaheng/pc/shipment/FilterConfigDetail/domain/FilterConfigDetail.java renamed to src/main/java/com/huaheng/pc/config/FilterConfigDetail/domain/FilterConfigDetail.java
1 | -package com.huaheng.pc.shipment.FilterConfigDetail.domain; | |
1 | +package com.huaheng.pc.config.FilterConfigDetail.domain; | |
2 | 2 | |
3 | 3 | import com.baomidou.mybatisplus.annotation.IdType; |
4 | 4 | import com.baomidou.mybatisplus.annotation.TableField; |
... | ... | @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; |
6 | 6 | import com.baomidou.mybatisplus.annotation.TableName; |
7 | 7 | import io.swagger.annotations.ApiModel; |
8 | 8 | import io.swagger.annotations.ApiModelProperty; |
9 | +import lombok.Data; | |
10 | + | |
9 | 11 | import java.io.Serializable; |
10 | 12 | import java.util.Date; |
11 | -import lombok.Data; | |
12 | 13 | |
13 | 14 | @ApiModel(value="com.huaheng.pc.shipment.FilterConfigDetail.domain.FilterConfigDetail") |
14 | 15 | @Data |
... | ... |
src/main/java/com/huaheng/pc/shipment/FilterConfigDetail/mapper/FilterConfigDetailMapper.java renamed to src/main/java/com/huaheng/pc/config/FilterConfigDetail/mapper/FilterConfigDetailMapper.java
1 | -package com.huaheng.pc.shipment.FilterConfigDetail.mapper; | |
1 | +package com.huaheng.pc.config.FilterConfigDetail.mapper; | |
2 | 2 | |
3 | 3 | import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
4 | -import com.huaheng.pc.shipment.FilterConfigDetail.domain.FilterConfigDetail; | |
4 | +import com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail; | |
5 | 5 | |
6 | 6 | public interface FilterConfigDetailMapper extends BaseMapper<FilterConfigDetail> { |
7 | 7 | } |
8 | 8 | \ No newline at end of file |
... | ... |
src/main/java/com/huaheng/pc/shipment/FilterConfigDetail/service/FilterConfigDetailService.java renamed to src/main/java/com/huaheng/pc/config/FilterConfigDetail/service/FilterConfigDetailService.java
1 | -package com.huaheng.pc.shipment.FilterConfigDetail.service; | |
1 | +package com.huaheng.pc.config.FilterConfigDetail.service; | |
2 | 2 | |
3 | -import org.springframework.stereotype.Service; | |
4 | -import javax.annotation.Resource; | |
5 | -import java.util.List; | |
6 | 3 | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
7 | -import com.huaheng.pc.shipment.FilterConfigDetail.domain.FilterConfigDetail; | |
8 | -import com.huaheng.pc.shipment.FilterConfigDetail.mapper.FilterConfigDetailMapper; | |
4 | +import com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail; | |
5 | +import com.huaheng.pc.config.FilterConfigDetail.mapper.FilterConfigDetailMapper; | |
6 | +import org.springframework.stereotype.Service; | |
7 | + | |
9 | 8 | @Service |
10 | 9 | public class FilterConfigDetailService extends ServiceImpl<FilterConfigDetailMapper, FilterConfigDetail> { |
11 | 10 | |
... | ... |
src/main/java/com/huaheng/pc/shipment/FilterConfigHeader/domain/FilterConfigHeader.java renamed to src/main/java/com/huaheng/pc/config/FilterConfigHeader/domain/FilterConfigHeader.java
1 | -package com.huaheng.pc.shipment.FilterConfigHeader.domain; | |
1 | +package com.huaheng.pc.config.FilterConfigHeader.domain; | |
2 | 2 | |
3 | 3 | import com.baomidou.mybatisplus.annotation.IdType; |
4 | 4 | import com.baomidou.mybatisplus.annotation.TableField; |
... | ... | @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; |
6 | 6 | import com.baomidou.mybatisplus.annotation.TableName; |
7 | 7 | import io.swagger.annotations.ApiModel; |
8 | 8 | import io.swagger.annotations.ApiModelProperty; |
9 | +import lombok.Data; | |
10 | + | |
9 | 11 | import java.io.Serializable; |
10 | 12 | import java.util.Date; |
11 | -import lombok.Data; | |
12 | 13 | |
13 | 14 | @ApiModel(value="com.huaheng.pc.shipment.FilterConfigHeader.domain.FilterConfigHeader") |
14 | 15 | @Data |
... | ... |
src/main/java/com/huaheng/pc/shipment/FilterConfigHeader/mapper/FilterConfigHeaderMapper.java renamed to src/main/java/com/huaheng/pc/config/FilterConfigHeader/mapper/FilterConfigHeaderMapper.java
1 | -package com.huaheng.pc.shipment.FilterConfigHeader.mapper; | |
1 | +package com.huaheng.pc.config.FilterConfigHeader.mapper; | |
2 | 2 | |
3 | 3 | import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
4 | -import com.huaheng.pc.shipment.FilterConfigHeader.domain.FilterConfigHeader; | |
4 | +import com.huaheng.pc.config.FilterConfigHeader.domain.FilterConfigHeader; | |
5 | 5 | |
6 | 6 | public interface FilterConfigHeaderMapper extends BaseMapper<FilterConfigHeader> { |
7 | 7 | } |
8 | 8 | \ No newline at end of file |
... | ... |
src/main/java/com/huaheng/pc/shipment/FilterConfigHeader/service/FilterConfigHeaderService.java renamed to src/main/java/com/huaheng/pc/config/FilterConfigHeader/service/FilterConfigHeaderService.java
1 | -package com.huaheng.pc.shipment.FilterConfigHeader.service; | |
1 | +package com.huaheng.pc.config.FilterConfigHeader.service; | |
2 | 2 | |
3 | -import org.springframework.stereotype.Service; | |
4 | -import javax.annotation.Resource; | |
5 | -import java.util.List; | |
6 | 3 | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
7 | -import com.huaheng.pc.shipment.FilterConfigHeader.mapper.FilterConfigHeaderMapper; | |
8 | -import com.huaheng.pc.shipment.FilterConfigHeader.domain.FilterConfigHeader; | |
4 | +import com.huaheng.pc.config.FilterConfigHeader.domain.FilterConfigHeader; | |
5 | +import com.huaheng.pc.config.FilterConfigHeader.mapper.FilterConfigHeaderMapper; | |
6 | +import org.springframework.stereotype.Service; | |
7 | + | |
9 | 8 | @Service |
10 | 9 | public class FilterConfigHeaderService extends ServiceImpl<FilterConfigHeaderMapper, FilterConfigHeader> { |
11 | 10 | |
... | ... |
src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/controller/ShipmentAnalyzeTemplateController.java
0 → 100644
1 | +package com.huaheng.pc.config.shipmentAnalyzeTemplate.controller; | |
2 | + | |
3 | + | |
4 | +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | |
5 | +import com.baomidou.mybatisplus.core.metadata.IPage; | |
6 | +import com.baomidou.mybatisplus.core.toolkit.Wrappers; | |
7 | +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | |
8 | +import com.huaheng.common.utils.StringUtils; | |
9 | +import com.huaheng.common.utils.security.ShiroUtils; | |
10 | +import com.huaheng.framework.aspectj.lang.annotation.Log; | |
11 | +import com.huaheng.framework.aspectj.lang.constant.BusinessType; | |
12 | +import com.huaheng.framework.web.controller.BaseController; | |
13 | +import com.huaheng.framework.web.page.PageDomain; | |
14 | +import com.huaheng.framework.web.page.TableDataInfo; | |
15 | +import com.huaheng.framework.web.page.TableSupport; | |
16 | +import com.huaheng.pc.config.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate; | |
17 | +import com.huaheng.pc.config.shipmentAnalyzeTemplate.service.ShipmentAnalyzeTemplateService; | |
18 | +import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader; | |
19 | +import io.swagger.annotations.Api; | |
20 | +import org.apache.shiro.authz.annotation.RequiresPermissions; | |
21 | +import org.springframework.beans.factory.annotation.Autowired; | |
22 | +import org.springframework.stereotype.Controller; | |
23 | +import org.springframework.web.bind.annotation.GetMapping; | |
24 | +import org.springframework.web.bind.annotation.PostMapping; | |
25 | +import org.springframework.web.bind.annotation.RequestMapping; | |
26 | +import org.springframework.web.bind.annotation.ResponseBody; | |
27 | + | |
28 | +import java.util.List; | |
29 | + | |
30 | +/** | |
31 | + * 订单分析结果 | |
32 | + * @author ricard | |
33 | + * @date 19.8.26 | |
34 | + * | |
35 | + */ | |
36 | + | |
37 | +@Api(tags={"订单分析结果"}) | |
38 | +@Controller | |
39 | +@RequestMapping("/config/shipmentAnalyzeTemplate") | |
40 | +public class ShipmentAnalyzeTemplateController extends BaseController { | |
41 | + | |
42 | + private String prefix = "config/shipmentAnalyzeTemplate"; | |
43 | + | |
44 | + @Autowired | |
45 | + private ShipmentAnalyzeTemplateService shipmentAnalyzeTemplateService; | |
46 | + | |
47 | + | |
48 | + @RequiresPermissions("config:shipmentAnalyzeTemplate:view") | |
49 | + @GetMapping() | |
50 | + public String location() { | |
51 | + return prefix + "/shipmentAnalyzeTemplate"; | |
52 | + } | |
53 | + | |
54 | + /** | |
55 | + * 查询订单分析结果 | |
56 | + */ | |
57 | + @RequiresPermissions("shipment:bill:list") | |
58 | + @Log(title = "配置-订单分析结果", operating="查看订单分析结果", action = BusinessType.GRANT) | |
59 | + @PostMapping("/list") | |
60 | + @ResponseBody | |
61 | + public TableDataInfo list(ShipmentAnalyzeTemplate shipmentAnalyzeTemplate, String createdBegin, String createdEnd) | |
62 | + { | |
63 | + LambdaQueryWrapper<ShipmentAnalyzeTemplate> lambdaQueryWrapper = Wrappers.lambdaQuery(); | |
64 | + PageDomain pageDomain = TableSupport.buildPageRequest(); | |
65 | + Integer pageNum = pageDomain.getPageNum(); | |
66 | + Integer pageSize = pageDomain.getPageSize(); | |
67 | + | |
68 | + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),ShipmentAnalyzeTemplate::getCreated, createdBegin) | |
69 | + .le(StringUtils.isNotEmpty(createdEnd), ShipmentAnalyzeTemplate::getCreated, createdEnd) | |
70 | + .eq(ShipmentAnalyzeTemplate::getWarehouseCode, ShiroUtils.getWarehouseCode()) | |
71 | + .eq(StringUtils.isNotEmpty(shipmentAnalyzeTemplate.getCriteriaCode() | |
72 | + ),ShipmentAnalyzeTemplate::getCriteriaCode,shipmentAnalyzeTemplate.getCriteriaCode()); | |
73 | + | |
74 | + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){ | |
75 | + /** | |
76 | + * 使用分页查询 | |
77 | + */ | |
78 | + Page<ShipmentAnalyzeTemplate> page = new Page<>(pageNum, pageSize); | |
79 | + IPage<ShipmentAnalyzeTemplate> iPage = shipmentAnalyzeTemplateService.page(page, lambdaQueryWrapper); | |
80 | + return getMpDataTable(iPage.getRecords(),iPage.getTotal()); | |
81 | + } else { | |
82 | + List<ShipmentAnalyzeTemplate> list = shipmentAnalyzeTemplateService.list(lambdaQueryWrapper); | |
83 | + return getDataTable(list); | |
84 | + } | |
85 | + } | |
86 | + | |
87 | +} | |
... | ... |
src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/domain/ShipmentAnalyzeTemplate.java renamed to src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/domain/ShipmentAnalyzeTemplate.java
1 | -package com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain; | |
1 | +package com.huaheng.pc.config.shipmentAnalyzeTemplate.domain; | |
2 | 2 | |
3 | 3 | import com.baomidou.mybatisplus.annotation.IdType; |
4 | 4 | import com.baomidou.mybatisplus.annotation.TableField; |
... | ... | @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; |
6 | 6 | import com.baomidou.mybatisplus.annotation.TableName; |
7 | 7 | import io.swagger.annotations.ApiModel; |
8 | 8 | import io.swagger.annotations.ApiModelProperty; |
9 | +import lombok.Data; | |
10 | + | |
9 | 11 | import java.io.Serializable; |
10 | 12 | import java.util.Date; |
11 | -import lombok.Data; | |
12 | 13 | |
13 | 14 | @ApiModel(value="com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate") |
14 | 15 | @Data |
... | ... |
src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/mapper/ShipmentAnalyzeTemplateMapper.java renamed to src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/mapper/ShipmentAnalyzeTemplateMapper.java
1 | -package com.huaheng.pc.shipment.shipmentAnalyzeTemplate.mapper; | |
1 | +package com.huaheng.pc.config.shipmentAnalyzeTemplate.mapper; | |
2 | 2 | |
3 | 3 | import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
4 | -import com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate; | |
4 | +import com.huaheng.pc.config.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate; | |
5 | 5 | |
6 | 6 | public interface ShipmentAnalyzeTemplateMapper extends BaseMapper<ShipmentAnalyzeTemplate> { |
7 | 7 | } |
8 | 8 | \ No newline at end of file |
... | ... |
src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/service/ShipmentAnalyzeTemplateService.java renamed to src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/service/ShipmentAnalyzeTemplateService.java
1 | -package com.huaheng.pc.shipment.shipmentAnalyzeTemplate.service; | |
1 | +package com.huaheng.pc.config.shipmentAnalyzeTemplate.service; | |
2 | 2 | |
3 | -import org.springframework.stereotype.Service; | |
4 | -import javax.annotation.Resource; | |
5 | -import java.util.List; | |
6 | 3 | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
7 | -import com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate; | |
8 | -import com.huaheng.pc.shipment.shipmentAnalyzeTemplate.mapper.ShipmentAnalyzeTemplateMapper; | |
4 | +import com.huaheng.pc.config.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate; | |
5 | +import com.huaheng.pc.config.shipmentAnalyzeTemplate.mapper.ShipmentAnalyzeTemplateMapper; | |
6 | +import org.springframework.stereotype.Service; | |
7 | + | |
9 | 8 | @Service |
10 | 9 | public class ShipmentAnalyzeTemplateService extends ServiceImpl<ShipmentAnalyzeTemplateMapper, ShipmentAnalyzeTemplate> { |
11 | 10 | |
... | ... |
src/main/resources/mybatis/shipment/FilterConfigDetailMapper.xml renamed to src/main/resources/mybatis/config/FilterConfigDetailMapper.xml
1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | 2 | <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
3 | 3 | <mapper namespace="com.huaheng.pc.shipment.FilterConfigDetail.mapper.FilterConfigDetailMapper"> |
4 | - <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.FilterConfigDetail.domain.FilterConfigDetail"> | |
4 | + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail"> | |
5 | 5 | <!--@mbg.generated--> |
6 | 6 | <id column="id" jdbcType="INTEGER" property="id" /> |
7 | 7 | <result column="headerId" jdbcType="INTEGER" property="headerId" /> |
... | ... |
src/main/resources/mybatis/shipment/FilterConfigHeaderMapper.xml renamed to src/main/resources/mybatis/config/FilterConfigHeaderMapper.xml
1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | 2 | <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
3 | 3 | <mapper namespace="com.huaheng.pc.shipment.FilterConfigHeader.mapper.FilterConfigHeaderMapper"> |
4 | - <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.FilterConfigHeader.domain.FilterConfigHeader"> | |
4 | + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.FilterConfigHeader.domain.FilterConfigHeader"> | |
5 | 5 | <!--@mbg.generated--> |
6 | 6 | <id column="id" jdbcType="INTEGER" property="id" /> |
7 | 7 | <result column="moduleType" jdbcType="VARCHAR" property="moduleType" /> |
... | ... |
src/main/resources/mybatis/shipment/ShipmentAnalyzeTemplateMapper.xml renamed to src/main/resources/mybatis/config/ShipmentAnalyzeTemplateMapper.xml
1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | 2 | <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
3 | 3 | <mapper namespace="com.huaheng.pc.shipment.shipmentAnalyzeTemplate.mapper.ShipmentAnalyzeTemplateMapper"> |
4 | - <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate"> | |
4 | + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate"> | |
5 | 5 | <!--@mbg.generated--> |
6 | 6 | <id column="id" jdbcType="INTEGER" property="id" /> |
7 | 7 | <result column="code" jdbcType="VARCHAR" property="code" /> |
... | ... |