Commit bd887008 by huangtao

physic

parent b2aa9437
Showing with 928 additions and 84 deletions
package com.jmai.physic.controller;
import com.jmai.physic.dto.PhysicAmpouleCreateReq;
import com.jmai.physic.dto.PhysicStorageAmpouleCreateReq;
import com.jmai.physic.service.PhysicAmpouleService;
import com.jmai.physic.service.PhysicStorageAmpouleService;
import com.jmai.sys.aop.Auth;
import com.jmai.sys.dto.ResponseData;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
@Slf4j
@Auth
@RestController
@RequestMapping("/physicAmpoule")
@Api(tags = "药品专用登记-药房/科室")
@ApiImplicitParams({@ApiImplicitParam(paramType = "header", name = "Access-Token", value = "凭证", required = true, dataType = "string")})
public class PhysicAmpouleController {
@Resource
private PhysicAmpouleService physicAmpouleService;
@PostMapping("/create")
@ApiOperation(value = "创建")
public ResponseData create(@RequestBody @Valid PhysicAmpouleCreateReq req) {
physicAmpouleService.create(req);
return ResponseData.ok();
}
}
package com.jmai.physic.controller;
import com.jmai.physic.dto.PhysicDestroyCheckCreateReq;
import com.jmai.physic.dto.PhysicRecordCreateReq;
import com.jmai.physic.service.PhysicDestroyCheckService;
import com.jmai.physic.service.PhysicDestroyService;
import com.jmai.sys.aop.Auth;
import com.jmai.sys.dto.ResponseData;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
@Slf4j
@Auth
@RestController
@RequestMapping("/physicDestroyCheck")
@Api(tags = "镇痛泵销毁")
public class PhysicDestroyCheckController {
@Resource
private PhysicDestroyCheckService physicDestroyCheckService;
@PostMapping("/create")
@ApiOperation(value = "创建")
public ResponseData create(@RequestBody @Valid PhysicDestroyCheckCreateReq req) {
physicDestroyCheckService.create(req);
return ResponseData.ok();
}
}
package com.jmai.physic.controller;
import com.jmai.physic.dto.PhysicRecordCreateReq;
import com.jmai.physic.service.PhysicRecordService;
import com.jmai.sys.aop.Auth;
import com.jmai.sys.dto.ResponseData;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
@Slf4j
@Auth
@RestController
@RequestMapping("/physicRecord")
@Api(tags = "药品专用登记")
@ApiImplicitParams({@ApiImplicitParam(paramType = "header", name = "Access-Token", value = "凭证", required = true, dataType = "string")})
public class PhysicRecordController {
@Resource
private PhysicRecordService physicRecordService;
@PostMapping("/create")
@ApiOperation(value = "创建")
public ResponseData createPhysicRecord(@RequestBody @Valid PhysicRecordCreateReq req) {
physicRecordService.PhysicRecordCreate(req);
return ResponseData.ok();
}
}
package com.jmai.physic.controller;
import com.jmai.physic.dto.PhysicStorageAmpouleCreateReq;
import com.jmai.physic.service.PhysicStorageAmpouleService;
import com.jmai.sys.aop.Auth;
import com.jmai.sys.dto.ResponseData;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
@Slf4j
@Auth
@RestController
@RequestMapping("/physicStorageAmpoule")
@Api(tags = "药品专用登记-药库")
@ApiImplicitParams({@ApiImplicitParam(paramType = "header", name = "Access-Token", value = "凭证", required = true, dataType = "string")})
public class PhysicStorageAmpouleController {
@Resource
private PhysicStorageAmpouleService physicStorageAmpouleService;
@PostMapping("/create")
@ApiOperation(value = "创建")
public ResponseData create(@RequestBody @Valid PhysicStorageAmpouleCreateReq req) {
physicStorageAmpouleService.create(req);
return ResponseData.ok();
}
}
package com.jmai.physic.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class PhysicAmpouleCreateReq {
private Integer type;
private Integer deptId;
private String remark;
@ApiModelProperty(value = "药品记录集")
private List<PhysicAmpouleCreateReq.Physic> physicList;
@Data
public static class Physic{
@ApiModelProperty(value = "药品名称")
private String physicName;
private String physicType;
@ApiModelProperty(value = "药品数量")
private Integer physicNum;
@ApiModelProperty(value = "规格")
private String physicSpec;
@ApiModelProperty(value = "批号")
private String batchNo;
private String unit;
}
}
......@@ -8,7 +8,6 @@ import lombok.Data;
@Data
@ApiModel(description = "药品申请信息")
@TableName("physic_apply")
public class PhysicApplyCreateReq {
@ApiModelProperty(value = "药品名称")
private String physicName;
......
package com.jmai.physic.dto;
import com.jmai.physic.entity.PhysicDestroyCheckDetail;
import lombok.Data;
import java.util.List;
@Data
public class PhysicDestroyCheckCreateReq {
private String applyName;
private String applyDeptId;
private String applyTitle;
private String applyReason;
private String images;
private List<PhysicDestroyCheckDetail> checkDetailList;
}
package com.jmai.physic.dto;
import lombok.Data;
import java.util.Date;
@Data
public class PhysicDestroyCreateReq {
private String sickName;
private String surplus;
private String images;
private Date destroyTime;
}
package com.jmai.physic.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class PhysicRecordCreateReq {
@ApiModelProperty(value = "患者姓名")
private String sickName;
private Integer sickSex;
private Integer sickAge;
private String sickIdCard;
private String hospitalNumber;
@ApiModelProperty(value = "疾病名称")
private String diseaseName;
@ApiModelProperty(value = "处方编号")
private String prescriptionNumber;
@ApiModelProperty(value = "处方医生")
private String prescriptionDoctor;
private List<Long> prescriptionImages;
@ApiModelProperty(value = "药品记录集")
private List<Physic> physicList;
@Data
public static class Physic{
@ApiModelProperty(value = "药品名称")
private String physicName;
@ApiModelProperty(value = "药品数量")
private Integer physicNum;
@ApiModelProperty(value = "规格")
private String physicSpec;
@ApiModelProperty(value = "批号")
private String batchNo;
}
}
package com.jmai.physic.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class PhysicStorageAmpouleCreateReq {
private Integer type;
private Integer deptId;
private String remark;
private Integer recycleReceiptNum;
@ApiModelProperty(value = "药品记录集")
private List<PhysicStorageAmpouleCreateReq.Physic> physicList;
@Data
public static class Physic{
@ApiModelProperty(value = "药品名称")
private String physicName;
private String physicType;
@ApiModelProperty(value = "药品数量")
private Integer physicNum;
@ApiModelProperty(value = "规格")
private String physicSpec;
@ApiModelProperty(value = "批号")
private String batchNo;
}
}
package com.jmai.physic.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jmai.sys.entity.BaseVersionEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(description = "药品专用登记-科室/药房")
@TableName("physic_ampoule")
public class PhysicAmpoule extends BaseVersionEntity {
@ApiModelProperty(value = "药品名称")
private String physicName;
@ApiModelProperty(value = "药品数量")
private Integer physicNum;
@ApiModelProperty(value = "规格")
private String physiSpec;
@ApiModelProperty(value = "批号")
private String batchNo;
private String unit;
private String physicType;
private Integer type;
private String orderNo;
private Integer deptId;
private Integer batchBalance;
private Integer physicBalance;
private String chUser;
private String fhUser;
private String remark;
}
package com.jmai.physic.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jmai.sys.entity.BaseVersionEntity;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.util.Date;
@Data
@ApiModel(description = "药品销毁表")
@TableName("physic_destroy")
public class PhysicDestroy extends BaseVersionEntity {
private Long deptId;
private String sickName;
private String orderNo;
private String surplus;
private Integer status;
private String czUser;
private String xhUser;
private String images;
private Date destroyTime;
}
package com.jmai.physic.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jmai.sys.entity.BaseVersionEntity;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@Data
@ApiModel(description = "药品销毁审核表")
@TableName("physic_destroy_check")
public class PhysicDestroyCheck extends BaseVersionEntity {
private String applyName;
private String applyDeptId;
private String applyTitle;
private String applyReason;
private String images;
private Integer destroyNum;
private Integer status;
}
package com.jmai.physic.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jmai.sys.entity.BaseVersionEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(description = "药品销毁审核表")
@TableName("physic_destroy_check")
public class PhysicDestroyCheckDetail extends BaseVersionEntity {
private Long checkId;
@ApiModelProperty(value = "药品名称")
private String physicName;
@ApiModelProperty(value = "药品数量")
private Integer physicNum;
@ApiModelProperty(value = "规格")
private String physiSpec;
@ApiModelProperty(value = "批号")
private String batchNo;
private String factoryName;
}
package com.jmai.physic.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jmai.sys.entity.BaseVersionEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(description = "药品专用登记")
@TableName("physic_record")
public class PhysicRecord extends BaseVersionEntity {
@ApiModelProperty(value = "药品名称")
private String physicName;
@ApiModelProperty(value = "药品数量")
private Integer physicNum;
@ApiModelProperty(value = "规格")
private String physiSpec;
@ApiModelProperty(value = "批号")
private String batchNo;
@ApiModelProperty(value = "患者姓名")
private String sickName;
private Integer sickSex;
private Integer sickAge;
private String sickIdCard;
private String hospitalNumber;
@ApiModelProperty(value = "疾病名称")
private String diseaseName;
@ApiModelProperty(value = "处方编号")
private String prescriptionNumber;
@ApiModelProperty(value = "处方医生")
private String prescriptionDoctor;
@ApiModelProperty(value = "状态 0-待调配 1-待发药 2-已完成+")
private Integer status;
private String dpUser;
private String fyUser;
}
package com.jmai.physic.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jmai.sys.entity.BaseVersionEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(description = "药品专用登记-药库")
@TableName("physic_storage_ampoule")
public class PhysicStorageAmpoule extends BaseVersionEntity {
@ApiModelProperty(value = "药品名称")
private String physicName;
@ApiModelProperty(value = "药品数量")
private Integer physicNum;
@ApiModelProperty(value = "规格")
private String physiSpec;
@ApiModelProperty(value = "批号")
private String batchNo;
private String unit;
private String physicType;
private Integer type;
private String orderNo;
private Integer deptId;
private Integer recycleReceiptNum;
private Integer batchBalance;
private Integer physicBalance;
private String jsUser;
private String thUser;
private Integer status;
private String remark;
}
package com.jmai.physic.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jmai.physic.entity.PhysicAmpoule;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface PhysicAmpouleMapper extends BaseMapper<PhysicAmpoule> {
}
package com.jmai.physic.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jmai.physic.entity.PhysicDestroyCheckDetail;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface PhysicDestroyCheckDetailMapper extends BaseMapper<PhysicDestroyCheckDetail> {
}
package com.jmai.physic.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jmai.physic.entity.PhysicBill;
import com.jmai.physic.entity.PhysicDestroyCheck;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface PhysicDestroyCheckMapper extends BaseMapper<PhysicDestroyCheck> {
}
package com.jmai.physic.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jmai.physic.entity.PhysicDestroy;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface PhysicDestroyMapper extends BaseMapper<PhysicDestroy> {
}
package com.jmai.physic.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jmai.physic.entity.PhysicRecord;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface PhysicRecordMapper extends BaseMapper<PhysicRecord> {
}
package com.jmai.physic.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jmai.physic.entity.PhysicStorageAmpoule;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface PhysicStorageAmpouleMapper extends BaseMapper<PhysicStorageAmpoule> {
}
package com.jmai.physic.service;
import com.jmai.physic.dto.PhysicAmpouleCreateReq;
public interface PhysicAmpouleService {
void create(PhysicAmpouleCreateReq req);
}
package com.jmai.physic.service;
import com.jmai.physic.dto.PhysicDestroyCheckCreateReq;
import com.jmai.physic.entity.PhysicDestroyCheck;
import com.jmai.physic.entity.PhysicDestroyCheckDetail;
import com.jmai.sys.service.BaseService;
public interface PhysicDestroyCheckDetailService extends BaseService<PhysicDestroyCheckDetail> {
}
package com.jmai.physic.service;
import com.jmai.physic.dto.PhysicDestroyCheckCreateReq;
import com.jmai.physic.entity.PhysicDestroyCheck;
import com.jmai.sys.service.BaseService;
public interface PhysicDestroyCheckService extends BaseService<PhysicDestroyCheck> {
void create(PhysicDestroyCheckCreateReq req);
}
package com.jmai.physic.service;
import com.jmai.physic.dto.PhysicAmpouleCreateReq;
import com.jmai.physic.dto.PhysicDestroyCreateReq;
public interface PhysicDestroyService {
void create(PhysicDestroyCreateReq req);
}
package com.jmai.physic.service;
import com.jmai.physic.dto.PhysicRecordCreateReq;
public interface PhysicRecordService {
void PhysicRecordCreate(PhysicRecordCreateReq req);
}
package com.jmai.physic.service;
import com.jmai.physic.dto.PhysicStorageAmpouleCreateReq;
public interface PhysicStorageAmpouleService {
void create(PhysicStorageAmpouleCreateReq req);
}
package com.jmai.physic.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.jmai.physic.dto.PhysicAmpouleCreateReq;
import com.jmai.physic.entity.PhysicAmpoule;
import com.jmai.physic.mapper.PhysicAmpouleMapper;
import com.jmai.physic.service.PhysicAmpouleService;
import com.jmai.sys.AbstractService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
@Service
public class PhysicAmpouleServiceImpl extends AbstractService implements PhysicAmpouleService {
@Resource
private PhysicAmpouleMapper physicAmpouleMapper;
@Transactional
@Override
public void create(PhysicAmpouleCreateReq req) {
for (PhysicAmpouleCreateReq.Physic physic : req.getPhysicList()) {
PhysicAmpoule ampoule = new PhysicAmpoule();
BeanUtil.copyProperties(req,ampoule);
ampoule.setPhysicName(physic.getPhysicName());
ampoule.setBatchNo(physic.getBatchNo());
ampoule.setPhysicNum(physic.getPhysicNum());
ampoule.setPhysiSpec(physic.getPhysicSpec());
ampoule.setPhysicType(physic.getPhysicType());
physicAmpouleMapper.insert(ampoule);
}
}
}
package com.jmai.physic.service.impl;
import com.jmai.physic.entity.PhysicDestroyCheckDetail;
import com.jmai.physic.mapper.PhysicDestroyCheckDetailMapper;
import com.jmai.physic.service.PhysicDestroyCheckDetailService;
import com.jmai.sys.service.impl.BaseServiceImpl;
import org.springframework.stereotype.Service;
@Service
public class PhysicDestroyCheckDetailServiceImpl extends BaseServiceImpl<PhysicDestroyCheckDetailMapper, PhysicDestroyCheckDetail> implements PhysicDestroyCheckDetailService {
}
package com.jmai.physic.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.jmai.physic.dto.PhysicDestroyCheckCreateReq;
import com.jmai.physic.entity.PhysicDestroy;
import com.jmai.physic.entity.PhysicDestroyCheck;
import com.jmai.physic.entity.PhysicDestroyCheckDetail;
import com.jmai.physic.mapper.PhysicDestroyCheckMapper;
import com.jmai.physic.service.PhysicDestroyCheckDetailService;
import com.jmai.physic.service.PhysicDestroyCheckService;
import com.jmai.sys.service.impl.BaseServiceImpl;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
@Service
public class PhysicDestroyCheckServiceImpl extends BaseServiceImpl<PhysicDestroyCheckMapper, PhysicDestroyCheck> implements PhysicDestroyCheckService {
@Resource
private PhysicDestroyCheckDetailService physicDestroyCheckDetailService;
@Transactional
@Override
public void create(PhysicDestroyCheckCreateReq req) {
PhysicDestroyCheck check = new PhysicDestroyCheck();
BeanUtil.copyProperties(req,check);
this.save(check);
for (PhysicDestroyCheckDetail physicDestroyCheckDetail : req.getCheckDetailList()) {
physicDestroyCheckDetail.setCheckId(check.getId());
}
physicDestroyCheckDetailService.saveBatch(req.getCheckDetailList());
}
}
package com.jmai.physic.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.jmai.physic.dto.PhysicDestroyCreateReq;
import com.jmai.physic.entity.PhysicDestroy;
import com.jmai.physic.mapper.PhysicDestroyMapper;
import com.jmai.physic.service.PhysicBillService;
import com.jmai.physic.service.PhysicDestroyService;
import com.jmai.sys.AbstractService;
import com.jmai.sys.ctx.SpringContextUtils;
import com.jmai.sys.entity.SysUser;
import com.jmai.sys.mapper.SysUserMapper;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@Service
public class PhysicDestroyServiceImpl extends AbstractService implements PhysicDestroyService {
@Resource
private SysUserMapper sysUserMapper;
@Resource
private PhysicDestroyMapper physicDestroyMapper;
@Override
public void create(PhysicDestroyCreateReq req) {
Long userId = SpringContextUtils.getUserId();
SysUser sysUser = sysUserMapper.selectById(userId);
PhysicDestroy destroy =new PhysicDestroy();
BeanUtil.copyProperties(req,destroy);
destroy.setDeptId(sysUser.getDeptId());
destroy.setStatus(0);
physicDestroyMapper.insert(destroy);
}
}
package com.jmai.physic.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.jmai.physic.dto.PhysicRecordCreateReq;
import com.jmai.physic.entity.PhysicRecord;
import com.jmai.physic.mapper.PhysicRecordMapper;
import com.jmai.physic.service.PhysicRecordService;
import com.jmai.sys.AbstractService;
import com.jmai.sys.consts.BizFileTypes;
import com.jmai.sys.service.BizFileService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
@Service
public class PhysicRecordServiceImpl extends AbstractService implements PhysicRecordService {
@Resource
private PhysicRecordMapper physicRecordMapper;
@Resource
private BizFileService bizFileService;
@Transactional
@Override
public void PhysicRecordCreate(PhysicRecordCreateReq req) {
for (PhysicRecordCreateReq.Physic physic : req.getPhysicList()) {
PhysicRecord record = new PhysicRecord();
BeanUtil.copyProperties(req,record);
record.setPhysicName(physic.getPhysicName());
record.setBatchNo(physic.getBatchNo());
record.setPhysicNum(physic.getPhysicNum());
record.setPhysiSpec(physic.getPhysicSpec());
physicRecordMapper.insert(record);
if(ObjectUtil.isNotEmpty(req.getPrescriptionImages())){
if (CollectionUtils.isNotEmpty(req.getPrescriptionImages())) {
bizFileService.addBizFilesIfAbsent(BizFileTypes.PHYSIC_RECORD_IMAGE,record.getId().toString(), req.getPrescriptionImages());
}
}
}
}
}
package com.jmai.physic.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.jmai.physic.dto.PhysicStorageAmpouleCreateReq;
import com.jmai.physic.entity.PhysicStorageAmpoule;
import com.jmai.physic.mapper.PhysicStorageAmpouleMapper;
import com.jmai.physic.service.PhysicStorageAmpouleService;
import com.jmai.sys.AbstractService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
@Service
public class PhysicStorageAmpouleServiceImpl extends AbstractService implements PhysicStorageAmpouleService {
@Resource
private PhysicStorageAmpouleMapper physicStorageAmpouleMapper;
@Transactional
@Override
public void create(PhysicStorageAmpouleCreateReq req) {
for (PhysicStorageAmpouleCreateReq.Physic physic : req.getPhysicList()) {
PhysicStorageAmpoule ampoule = new PhysicStorageAmpoule();
BeanUtil.copyProperties(req,ampoule);
ampoule.setPhysicName(physic.getPhysicName());
ampoule.setBatchNo(physic.getBatchNo());
ampoule.setPhysicNum(physic.getPhysicNum());
ampoule.setPhysiSpec(physic.getPhysicSpec());
ampoule.setPhysicType(physic.getPhysicType());
physicStorageAmpouleMapper.insert(ampoule);
}
}
}
......@@ -134,13 +134,7 @@ public class SwaggerConfiguration implements WebMvcConfigurer {
.select()
.apis(basePackages(
"com.jmai.sys.controller",
"com.jmai.ivs.controller",
"com.jmai.open.**.controller",
"com.jmai.ocr.controller",
"com.jmai.bi.controller",
"com.jmai.udi.controller",
"com.jmai.x.**.controller"
"com.jmai.physic.controller"
))
.build()
.globalRequestParameters(getRequestParameters());
......@@ -165,78 +159,17 @@ public class SwaggerConfiguration implements WebMvcConfigurer {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(getApiInfo())
.useDefaultResponseMessages(false)
.groupName("2-ivs")
.groupName("3-physic")
.select()
.apis(basePackages("com.jmai.ivs.controller"))
.apis(basePackages("com.jmai.physic.controller"))
.paths(PathSelectors.any())
.build()
.globalRequestParameters(getRequestParameters());
}
@Bean
@ConditionalOnProperty(name = "swagger.enable", havingValue = "true")
public Docket openApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(getApiInfo())
.useDefaultResponseMessages(false)
.groupName("3-open")
.select()
.apis(basePackages("com.jmai.open.**.controller"))
.build()
.globalRequestParameters(getRequestParameters());
}
@Bean
@ConditionalOnProperty(name = "swagger.enable", havingValue = "true")
public Docket ocrApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(getApiInfo())
.useDefaultResponseMessages(false)
.groupName("4-ocr")
.select()
.apis(basePackages("com.jmai.ocr.controller"))
.build()
.globalRequestParameters(getRequestParameters());
}
@Bean
@ConditionalOnProperty(name = "swagger.enable", havingValue = "true")
public Docket biApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(getApiInfo())
.useDefaultResponseMessages(false)
.groupName("5-bi")
.select()
.apis(basePackages("com.jmai.bi.controller"))
.build()
.globalRequestParameters(getRequestParameters());
}
@Bean
@ConditionalOnProperty(name = "swagger.enable", havingValue = "true")
public Docket udiApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(getApiInfo())
.useDefaultResponseMessages(false)
.groupName("6-udi")
.select()
.apis(basePackages("com.jmai.udi.controller"))
.build()
.globalRequestParameters(getRequestParameters());
}
@Bean
@ConditionalOnProperty(name = "swagger.enable", havingValue = "true")
public Docket xApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(getApiInfo())
.useDefaultResponseMessages(false)
.groupName("9-其他")
.select()
.apis(basePackages("com.jmai.x.**.controller"))
.build()
.globalRequestParameters(getRequestParameters());
}
private List<RequestParameter> getRequestParameters() {
RequestParameterBuilder builder = new RequestParameterBuilder();
......
......@@ -11,19 +11,8 @@ public interface BizFileTypes {
/*******************************************************************
* 基础模块
******************************************************************/
@ApiModelProperty("用户人脸")
String SYS_USER_FACEBOOK = "sys.user.facebook";
@ApiModelProperty("药品专用登记图片")
String PHYSIC_RECORD_IMAGE = "physic.record.image";
/*******************************************************************
* 核验模块
******************************************************************/
@ApiModelProperty("导入结果")
String IVS_IMPORTER_RESULT = "ivs.importer.result";
@ApiModelProperty("业务单图片")
String IVS_BIZ_ORDER_IMAGE = "ivs.order.image";
@ApiModelProperty("核验单图片")
String IVS_VERIFY_ORDER_IMAGE = "ivs.verifyOrder.image";
@ApiModelProperty("核验任务图片")
String IVS_VERIFY_TASK_IMAGE = "ivs.verifyTask.image";
}
package com.jmai.sys.service;
import com.baomidou.mybatisplus.extension.service.IService;
public interface BaseService<T> extends IService<T> {
}
package com.jmai.sys.service.impl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jmai.sys.service.BaseService;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
/**
* 公共Service父类
*/
public abstract class BaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M, T> implements BaseService<T> {
/**
* 实体类型
*/
private Class<?> entityClass;
{
Class<?> clazz = this.getClass();
Type type = clazz.getGenericSuperclass();
if (type instanceof ParameterizedType) {
Type[] p = ((ParameterizedType) type).getActualTypeArguments();
this.entityClass = (Class<T>) p[1];
}
}
}
This diff could not be displayed because it is too large.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment