diff --git a/src/main/java/com/glxp/api/controller/sup/UserComanyController.java b/src/main/java/com/glxp/api/controller/sup/UserComanyController.java index f6441bc..3d563b9 100644 --- a/src/main/java/com/glxp/api/controller/sup/UserComanyController.java +++ b/src/main/java/com/glxp/api/controller/sup/UserComanyController.java @@ -29,7 +29,7 @@ public class UserComanyController extends BaseController { // 关键字搜索 - @AuthRuleAnnotation("") + @AuthRuleAnnotation("udi/auth/user/comapny/search") @GetMapping("udi/auth/user/comapny/search") public BaseResponse search(FilterUserComapanyRequest filterUserComapanyRequest) { //获取部门id diff --git a/src/main/java/com/glxp/api/controller/trace/TraceRecordController.java b/src/main/java/com/glxp/api/controller/trace/TraceRecordController.java new file mode 100644 index 0000000..a458f5d --- /dev/null +++ b/src/main/java/com/glxp/api/controller/trace/TraceRecordController.java @@ -0,0 +1,48 @@ +package com.glxp.api.controller.trace; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.auth.DeptEntity; +import com.glxp.api.entity.sup.UserCompanyEntity; +import com.glxp.api.req.auth.FilterUserComapanyRequest; +import com.glxp.api.req.trace.TraceRecordRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.trace.TraceRecordResponse; +import com.glxp.api.service.sup.UserCompanyService; +import com.glxp.api.service.trace.TraceRecordService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +import javax.annotation.Resource; +import java.util.List; + +@ApiIgnore +@RestController +@Slf4j +public class TraceRecordController extends BaseController { + + @Resource + TraceRecordService traceRecordService; + + // 查询记录搜索 + @AuthRuleAnnotation("udi/trace/record/filter") + @GetMapping("udi/trace/record/filter") + public BaseResponse filterLogs(TraceRecordRequest traceRecordRequest) { + + List traceRecordResponses = traceRecordService.filterTraces(traceRecordRequest); + PageInfo pageInfo = new PageInfo<>(traceRecordResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(traceRecordResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + + + +} diff --git a/src/main/java/com/glxp/api/controller/trace/UdiTraceController.java b/src/main/java/com/glxp/api/controller/trace/UdiTraceController.java new file mode 100644 index 0000000..f19511f --- /dev/null +++ b/src/main/java/com/glxp/api/controller/trace/UdiTraceController.java @@ -0,0 +1,13 @@ +package com.glxp.api.controller.trace; + +import com.glxp.api.controller.BaseController; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +@ApiIgnore +@RestController +@Slf4j +public class UdiTraceController extends BaseController { +} diff --git a/src/main/java/com/glxp/api/dao/trace/TraceRecordDetailMapper.java b/src/main/java/com/glxp/api/dao/trace/TraceRecordDetailMapper.java new file mode 100644 index 0000000..67fc507 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/trace/TraceRecordDetailMapper.java @@ -0,0 +1,9 @@ +package com.glxp.api.dao.trace; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.trace.TraceRecordDetailEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface TraceRecordDetailMapper extends BaseMapper { +} diff --git a/src/main/java/com/glxp/api/dao/trace/TraceRecordMapper.java b/src/main/java/com/glxp/api/dao/trace/TraceRecordMapper.java new file mode 100644 index 0000000..211d823 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/trace/TraceRecordMapper.java @@ -0,0 +1,16 @@ +package com.glxp.api.dao.trace; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.trace.TraceRecordEntity; +import com.glxp.api.req.trace.TraceRecordRequest; +import com.glxp.api.res.trace.TraceRecordResponse; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface TraceRecordMapper extends BaseMapper { + + + List filterTraces(TraceRecordRequest traceRecordRequest); +} diff --git a/src/main/java/com/glxp/api/entity/trace/TraceRecordDetailEntity.java b/src/main/java/com/glxp/api/entity/trace/TraceRecordDetailEntity.java new file mode 100644 index 0000000..f8f0cdb --- /dev/null +++ b/src/main/java/com/glxp/api/entity/trace/TraceRecordDetailEntity.java @@ -0,0 +1,93 @@ +package com.glxp.api.entity.trace; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; + +/** + * 查询记录子表 + */ +@Data +@TableName(value = "trace_record_detail") +public class TraceRecordDetailEntity implements Serializable { + @TableId(value = "id", type = IdType.INPUT) + private Long id; + + /** + * 查询记录主表ID外键 + + */ + @TableField(value = "recordIdFk") + private String recordIdFk; + + /** + * 查询方案（按UDI码查询/按批次号查询） + */ + @TableField(value = "traceType") + private Integer traceType; + + /** + * UDI码 + */ + @TableField(value = "udiCode") + private String udiCode; + + /** + * 社会信用号 + */ + @TableField(value = "creditNum") + private String creditNum; + + /** + * 注册备案人 + */ + @TableField(value = "ylqxzcrbarmc") + private String ylqxzcrbarmc; + + /** + * 产品主DI标识 + */ + @TableField(value = "nameCode") + private String nameCode; + + /** + * 产品通用名 + */ + @TableField(value = "cpmctymc") + private String cpmctymc; + + /** + * 规格型号 + */ + @TableField(value = "ggxh") + private String ggxh; + + /** + * 生产批次号 + */ + @TableField(value = "batchNo") + private String batchNo; + + /** + * 生产日期 + */ + @TableField(value = "produceDate") + private String produceDate; + + /** + * 失效日期 + */ + @TableField(value = "expireDate") + private String expireDate; + + /** + * 序列号 + */ + @TableField(value = "serialNo") + private String serialNo; + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/api/entity/trace/TraceRecordEntity.java b/src/main/java/com/glxp/api/entity/trace/TraceRecordEntity.java new file mode 100644 index 0000000..010af79 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/trace/TraceRecordEntity.java @@ -0,0 +1,57 @@ +package com.glxp.api.entity.trace; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 查询记录表 + */ +@Data +@TableName(value = "trace_record") +public class TraceRecordEntity implements Serializable { + @TableId(value = "id", type = IdType.INPUT) + private Long id; + + /** + * 查询记录号 + */ + @TableField(value = "recordCode") + private String recordCode; + + /** + * 查询来源 + */ + @TableField(value = "fromType") + private Integer fromType; + + /** + * 查询者 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 查询记录时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/api/req/trace/TraceRecordRequest.java b/src/main/java/com/glxp/api/req/trace/TraceRecordRequest.java new file mode 100644 index 0000000..99b5f15 --- /dev/null +++ b/src/main/java/com/glxp/api/req/trace/TraceRecordRequest.java @@ -0,0 +1,80 @@ +package com.glxp.api.req.trace; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.Date; + +@Data +public class TraceRecordRequest extends ListPageRequest { + + + private Long id; + + /** + * 查询记录号 + */ + private String recordCode; + + /** + * 查询来源 + */ + private Integer fromType; + + /** + * 查询者 + */ + private String createUser; + + /** + * 查询记录时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 查询方案（按UDI码查询/按批次号查询） + */ + private Integer traceType; + + /** + * UDI码 + */ + private String udiCode; + + /** + * 社会信用号 + */ + private String creditNum; + + /** + * 注册备案人 + */ + private String ylqxzcrbarmc; + + /** + * 产品主DI标识 + */ + private String nameCode; + + /** + * 产品通用名 + */ + private String cpmctymc; + + /** + * 规格型号 + */ + private String ggxh; + + /** + * 生产批次号 + */ + private String batchNo; + + +} diff --git a/src/main/java/com/glxp/api/res/basic/BasicUdiRelResponse.java b/src/main/java/com/glxp/api/res/basic/BasicUdiRelResponse.java index e13ea48..8865498 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicUdiRelResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicUdiRelResponse.java @@ -1,9 +1,5 @@ package com.glxp.api.res.basic; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/trace/TraceRecordResponse.java b/src/main/java/com/glxp/api/res/trace/TraceRecordResponse.java new file mode 100644 index 0000000..0a92329 --- /dev/null +++ b/src/main/java/com/glxp/api/res/trace/TraceRecordResponse.java @@ -0,0 +1,101 @@ +package com.glxp.api.res.trace; + +import lombok.Data; + +import java.util.Date; + +@Data +public class TraceRecordResponse { + + + private Long id; + + /** + * 查询记录号 + */ + private String recordCode; + + /** + * 查询来源 + */ + private Integer fromType; + + /** + * 查询者 + */ + private String createUser; + + /** + * 查询记录时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 备注 + */ + private String remark; + + + private String recordIdFk; + + /** + * 查询方案（按UDI码查询/按批次号查询） + */ + private Integer traceType; + + /** + * UDI码 + */ + private String udiCode; + + /** + * 社会信用号 + */ + private String creditNum; + + /** + * 注册备案人 + */ + private String ylqxzcrbarmc; + + /** + * 产品主DI标识 + */ + private String nameCode; + + /** + * 产品通用名 + */ + private String cpmctymc; + + /** + * 规格型号 + */ + private String ggxh; + + /** + * 生产批次号 + */ + private String batchNo; + + /** + * 生产日期 + */ + private String produceDate; + + /** + * 失效日期 + */ + private String expireDate; + + /** + * 序列号 + */ + private String serialNo; + +} diff --git a/src/main/java/com/glxp/api/service/trace/TraceRecordDetailService.java b/src/main/java/com/glxp/api/service/trace/TraceRecordDetailService.java new file mode 100644 index 0000000..81e3254 --- /dev/null +++ b/src/main/java/com/glxp/api/service/trace/TraceRecordDetailService.java @@ -0,0 +1,8 @@ +package com.glxp.api.service.trace; + +import com.glxp.api.entity.trace.TraceRecordDetailEntity; +import com.baomidou.mybatisplus.extension.service.IService; +public interface TraceRecordDetailService extends IService{ + + +} diff --git a/src/main/java/com/glxp/api/service/trace/TraceRecordService.java b/src/main/java/com/glxp/api/service/trace/TraceRecordService.java new file mode 100644 index 0000000..c47c9f9 --- /dev/null +++ b/src/main/java/com/glxp/api/service/trace/TraceRecordService.java @@ -0,0 +1,13 @@ +package com.glxp.api.service.trace; + +import com.glxp.api.entity.trace.TraceRecordEntity; +import com.baomidou.mybatisplus.extension.service.IService; +import com.glxp.api.req.trace.TraceRecordRequest; +import com.glxp.api.res.trace.TraceRecordResponse; + +import java.util.List; + +public interface TraceRecordService extends IService { + + List filterTraces(TraceRecordRequest traceRecordRequest); +} diff --git a/src/main/java/com/glxp/api/service/trace/impl/TraceRecordDetailServiceImpl.java b/src/main/java/com/glxp/api/service/trace/impl/TraceRecordDetailServiceImpl.java new file mode 100644 index 0000000..e90c398 --- /dev/null +++ b/src/main/java/com/glxp/api/service/trace/impl/TraceRecordDetailServiceImpl.java @@ -0,0 +1,12 @@ +package com.glxp.api.service.trace.impl; + +import com.glxp.api.service.trace.TraceRecordDetailService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.dao.trace.TraceRecordDetailMapper; +import com.glxp.api.entity.trace.TraceRecordDetailEntity; + +@Service +public class TraceRecordDetailServiceImpl extends ServiceImpl implements TraceRecordDetailService { + +} diff --git a/src/main/java/com/glxp/api/service/trace/impl/TraceRecordServiceImpl.java b/src/main/java/com/glxp/api/service/trace/impl/TraceRecordServiceImpl.java new file mode 100644 index 0000000..bfe84b2 --- /dev/null +++ b/src/main/java/com/glxp/api/service/trace/impl/TraceRecordServiceImpl.java @@ -0,0 +1,34 @@ +package com.glxp.api.service.trace.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.req.trace.TraceRecordRequest; +import com.glxp.api.res.trace.TraceRecordResponse; +import com.glxp.api.service.trace.TraceRecordService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.dao.trace.TraceRecordMapper; +import com.glxp.api.entity.trace.TraceRecordEntity; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class TraceRecordServiceImpl extends ServiceImpl implements TraceRecordService { + + + @Resource + TraceRecordMapper traceRecordMapper; + + @Override + public List filterTraces(TraceRecordRequest traceRecordRequest) { + if (traceRecordRequest == null) { + return Collections.emptyList(); + } + if (traceRecordRequest.getPage() != null) { + int offset = (traceRecordRequest.getPage() - 1) * traceRecordRequest.getLimit(); + PageHelper.offsetPage(offset, traceRecordRequest.getLimit()); + } + return traceRecordMapper.filterTraces(traceRecordRequest); + } +} diff --git a/src/main/resources/mybatis/mapper/trace/TraceRecordDetailMapper.xml b/src/main/resources/mybatis/mapper/trace/TraceRecordDetailMapper.xml new file mode 100644 index 0000000..20ecad8 --- /dev/null +++ b/src/main/resources/mybatis/mapper/trace/TraceRecordDetailMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml b/src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml new file mode 100644 index 0000000..d57ca76 --- /dev/null +++ b/src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml @@ -0,0 +1,50 @@ + + + + +