Merge branch 'master' of git.patzn.com:wangweidong/pt-tobacco-lims-service

gradle/wrapper/gradle-wrapper.properties

+#Mon Mar 23 14:37:03 CST 2020
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

src/main/java/com/patzn/lims/drug/controller/DrugSampleFlowController.java

+package com.patzn.lims.drug.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.patzn.lims.core.PtConstants;
+import com.patzn.lims.core.api.PtResult;
+import com.patzn.lims.core.web.ServiceController;
+import com.patzn.lims.drug.entity.DrugSampleFlow;
+import com.patzn.lims.drug.service.IDrugSampleFlowService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * ${table.comment} 前端控制器
+ * </p>
+ *
+ * @author wwd
+ * @since 2020-06-09
+ */
+@Api(tags = "${table.comment}")
+@RestController
+@RequestMapping("/v1/sample_flow")
+public class DrugSampleFlowController extends ServiceController<IDrugSampleFlowService, DrugSampleFlow> {
+
+    @ApiOperation(value = "分页列表", notes = "分页查询数据列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = PtConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = PtConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = PtConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = PtConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataType = "String"),
+    })
+    @PostMapping("/page")
+	public PtResult<IPage<DrugSampleFlow>> getPage(DrugSampleFlow drugSampleFlow) {
+        return success(baseService.page(getPage(), drugSampleFlow));
+	}
+
+}

src/main/java/com/patzn/lims/drug/dto/DrugSampleFlowDTO.java

+package com.patzn.lims.drug.dto;
+import com.patzn.lims.drug.entity.DrugSample;
+import com.patzn.lims.drug.entity.DrugSampleFlow;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+@ApiModel
+public class DrugSampleFlowDTO extends DrugSample {
+
+
+    @ApiModelProperty(value = "样品流转数据集合")
+    private List<DrugSampleFlow> sampleFlows;
+
+
+}

src/main/java/com/patzn/lims/drug/entity/DrugSampleFlow.java

+package com.patzn.lims.drug.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.patzn.lims.core.bean.BaseEntity;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wwd
+ * @since 2020-06-09
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel
+public class DrugSampleFlow extends BaseEntity {
+
+    @ApiModelProperty(value = "样品ID")
+	private Long sampleId;
+    @ApiModelProperty(value = "检测科室ID")
+	private Long groupId;
+    @ApiModelProperty(value = "检测科室")
+	private String groupName;
+    @ApiModelProperty(value = "流转人")
+	private String flower;
+    @ApiModelProperty(value = "流转人ID")
+	private Long flowerId;
+    @ApiModelProperty(value = "流转时间")
+	private Date flowTime;
+    @ApiModelProperty(value = "流转数量")
+	private BigDecimal flowQuantity;
+    @ApiModelProperty(value = "流转单位")
+	private String unit;
+    @ApiModelProperty(value = "企业ID")
+	@TableField(fill = FieldFill.INSERT)
+	private Long companyId;
+    @ApiModelProperty(value = "是否删除0否1是")
+    @TableLogic
+	private Integer deleted;
+    @ApiModelProperty(value = "创建人")
+	@TableField(fill = FieldFill.INSERT)
+	private Long uid;
+    @ApiModelProperty(value = "创建时间")
+	@TableField(fill = FieldFill.INSERT)
+	private Date ctime;
+    @ApiModelProperty(value = "最后修改人")
+	@TableField(fill = FieldFill.UPDATE)
+	private Long lid;
+    @ApiModelProperty(value = "最后修改时间")
+	@TableField(fill = FieldFill.UPDATE)
+	private Date ltime;
+
+
+}

src/main/java/com/patzn/lims/drug/mapper/DrugSampleFlowMapper.java

+package com.patzn.lims.drug.mapper;
+
+import com.patzn.lims.drug.entity.DrugSampleFlow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wwd
+ * @since 2020-06-09
+ */
+public interface DrugSampleFlowMapper extends BaseMapper<DrugSampleFlow> {
+
+}

src/main/java/com/patzn/lims/drug/service/IDrugSampleFlowService.java

+package com.patzn.lims.drug.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.patzn.lims.core.web.IBaseService;
+import com.patzn.lims.drug.entity.DrugSampleFlow;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wwd
+ * @since 2020-06-09
+ */
+public interface IDrugSampleFlowService extends IBaseService<DrugSampleFlow> {
+
+    Page<DrugSampleFlow> page(Page<DrugSampleFlow> page, DrugSampleFlow drugSampleFlow);
+}

src/main/java/com/patzn/lims/drug/service/impl/DrugSampleFlowServiceImpl.java

+package com.patzn.lims.drug.service.impl;
+
+import com.patzn.lims.drug.entity.DrugSampleFlow;
+import com.patzn.lims.drug.mapper.DrugSampleFlowMapper;
+import com.patzn.lims.drug.service.IDrugSampleFlowService;
+import com.patzn.lims.core.web.BaseServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wwd
+ * @since 2020-06-09
+ */
+@Service
+public class DrugSampleFlowServiceImpl extends BaseServiceImpl<DrugSampleFlowMapper, DrugSampleFlow> implements IDrugSampleFlowService {
+
+    @Override
+    public Page<DrugSampleFlow> page(Page<DrugSampleFlow> page, DrugSampleFlow drugSampleFlow) {
+        QueryWrapper<DrugSampleFlow> wrapper = Wrappers.<DrugSampleFlow>query(drugSampleFlow);
+        return this.page(page, wrapper);
+    }
+}

src/main/resources/mapper/drug/DrugSampleFlowMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.patzn.lims.drug.mapper.DrugSampleFlowMapper">
+
+</mapper>

src/test/java/com/patzn/lims/test/PtTobaccoCodeGenerator.java

@@ -23,9 +23,9 @@ public class PtTobaccoCodeGenerator {
         new PostgresqlGenerator().setDataSourceConfig(new DataSourceConfig()
                 .setDbType(DbType.POSTGRE_SQL)
                 .setDriverName("org.postgresql.Driver")
-                .setUrl("jdbc:postgresql://192.168.0.115:5432/tobacco_lims_dev")
+                .setUrl("jdbc:postgresql://localhost:5432/tobacco_lims_dev")
                 .setUsername("postgres")
-                .setPassword("123456")
+                .setPassword("111111")
         ).execute();
     }
 }