Skip to content

Y
yd-backend
Commit c0920914 by yao.xiao
Options

解决冲突

parents 3ae95267 5aba94c7
Showing with 1121 additions and 43 deletions
yd-api/pom.xml
......@@ -22,13 +22,18 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<!-- 编译时的编码 -->
<!-- 编译时的编码 -->
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
</properties>
<dependencies>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>2.3.20</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
......@@ -69,43 +74,44 @@
<artifactId>commons-lang3</artifactId>
<version>3.7</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>0.6.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.2.5</version>
</dependency>
<!--
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>2.8.0</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>2.8.0</version>
</dependency>
-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>0.6.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.12</version>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.2.5</version>
</dependency>
<!--
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>2.8.0</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>2.8.0</version>
</dependency>
-->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
......@@ -221,10 +227,11 @@
<scope>system</scope>
<systemPath>${basedir}/lib/com-libs-pdf-0.0.1.jar</systemPath>
</dependency>
</dependencies>
<build>
<finalName>ydapi</finalName>
<finalName>ydapi</finalName>
<resources>
<resource>
<!--<targetPath>/WEB-INF/classes</targetPath>-->
......
yd-api/src/main/java/com/yd/api/agms/AgmsController.java
package com.yd.api.agms;
import com.yd.api.agms.service.*;
import com.yd.api.agms.service.AgmsDashboardService;
import com.yd.api.agms.service.AgmsFortuneService;
import com.yd.api.agms.service.AgmsHiringService;
import com.yd.api.agms.service.AgmsPractitionerService;
import com.yd.api.agms.vo.dashboard.*;
import com.yd.api.agms.vo.fortune.*;
import com.yd.api.agms.vo.hiring.*;
import com.yd.api.agms.vo.sharing.ControllerResponseVO;
import com.yd.api.agms.vo.practitioner.PractitionerFileSharingListRequestVO;
import com.yd.api.agms.vo.practitioner.PractitionerFileSharingListResponseVO;
import com.yd.api.agms.vo.practitioner.PractitionerFileSharingSaveRequestVO;
import com.yd.api.agms.vo.practitioner.PractitionerFileSharingSaveResponseVO;
import com.yd.api.agms.vo.statistics.FinancialStatisticsRequestVO;
import com.yd.api.agms.vo.statistics.FinancialStatisticsResponseVO;
import com.yd.api.agms.vo.statistics.LeadsStatisticsRequestVO;
......@@ -31,6 +39,8 @@ public class AgmsController {
private AgmsHiringService agmsHiringService;
@Autowired
private AgmsSharingService agmsSharingService;
@Autowired
private AgmsPractitionerService agmsPractitionerService;
/**
* AGMS -- 财务管理报表
......@@ -285,7 +295,34 @@ public class AgmsController {
@RequestMapping(value="/controller")
public Object controller(@RequestParam String action,@RequestParam(value = "upfile",required = false) MultipartFile upfile) {
ControllerResponseVO responseVO = agmsSharingService.controller(action,upfile);
ControllerResponseVO responseVO = agmsSharingService.controller(action, upfile);
return responseVO;
}
/**
* AGMS -- 经纪人保存文章
* @param requestVO 请求数据
* @return 响应数据
*/
@RequestMapping(value="/practitionerFileSharingSave")
public Object practitionerFileSharingSave(@RequestBody PractitionerFileSharingSaveRequestVO requestVO) {
JsonResult result = new JsonResult();
PractitionerFileSharingSaveResponseVO responseVO = agmsPractitionerService.practitionerFileSharingSave(requestVO);
result.setData(responseVO);
result.addResult(responseVO);
return result;
}
/**
* AGMS -- 经纪人查询文章
* @param requestVO 请求数据
* @return 响应数据
*/
@RequestMapping(value="/practitionerFileSharingList")
public Object practitionerFileSharingList(@RequestBody PractitionerFileSharingListRequestVO requestVO) {
JsonResult result = new JsonResult();
PractitionerFileSharingListResponseVO responseVO = agmsPractitionerService.practitionerFileSharingList(requestVO);
result.setData(responseVO);
result.addResult(responseVO);
return result;
}
}
yd-api/src/main/java/com/yd/api/agms/service/AgmsPractitionerService.java 0 → 100644
package com.yd.api.agms.service;
import com.yd.api.agms.vo.practitioner.PractitionerFileSharingListRequestVO;
import com.yd.api.agms.vo.practitioner.PractitionerFileSharingListResponseVO;
import com.yd.api.agms.vo.practitioner.PractitionerFileSharingSaveRequestVO;
import com.yd.api.agms.vo.practitioner.PractitionerFileSharingSaveResponseVO;
/**
* @author xxy
*/
public interface AgmsPractitionerService {
/**
* AGMS -- 经纪人保存文章
* @param requestVO 请求数据
* @return 响应数据
*/
PractitionerFileSharingSaveResponseVO practitionerFileSharingSave(PractitionerFileSharingSaveRequestVO requestVO);
/**
* AGMS -- 经纪人查询文章
* @param requestVO 请求数据
* @return 响应数据
*/
PractitionerFileSharingListResponseVO practitionerFileSharingList(PractitionerFileSharingListRequestVO requestVO);
}
yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsPractitionerServiceImpl.java 0 → 100644
package com.yd.api.agms.service.impl;
import com.github.pagehelper.PageInfo;
import com.yd.api.agms.service.AgmsPractitionerService;
import com.yd.api.agms.vo.practitioner.*;
import com.yd.api.result.CommonResult;
import com.yd.dal.entity.customer.AclPractitionerFileSharing;
import com.yd.dal.service.agms.AgmsPractitionerDALService;
import com.yd.dal.service.customer.AclPractitionerFileSharingDALService;
import com.yd.util.config.ZHBErrorConfig;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* @author xxy
*/
@Service("agmsPractitionerService")
public class AgmsPractitionerServiceImpl implements AgmsPractitionerService {
@Autowired
private AclPractitionerFileSharingDALService aclPractitionerFileSharingDalService;
@Autowired
private AgmsPractitionerDALService agmsPractitionerDALService;
@Override
public PractitionerFileSharingSaveResponseVO practitionerFileSharingSave(PractitionerFileSharingSaveRequestVO requestVO) {
PractitionerFileSharingSaveResponseVO responseVO = new PractitionerFileSharingSaveResponseVO();
AclPractitionerFileSharing fileSharing = new AclPractitionerFileSharing();
BeanUtils.copyProperties(requestVO,fileSharing);
fileSharing.setUpdatedBy(requestVO.getLoginId());
Long id = aclPractitionerFileSharingDalService.saveOrUpdate(fileSharing);
responseVO.setId(id);
responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
return responseVO;
}
@Override
public PractitionerFileSharingListResponseVO practitionerFileSharingList(PractitionerFileSharingListRequestVO requestVO) {
PractitionerFileSharingListResponseVO responseVO = new PractitionerFileSharingListResponseVO();
PageInfo<PractitionerFileSharing> practitionerFileShares = agmsPractitionerDALService.practitionerFileSharingList(requestVO.getMdDropOptionId(),
requestVO.getIsActive(),
requestVO.getPractitionerFileShares().getPageNum(),
requestVO.getPractitionerFileShares().getPageSize());
responseVO.setPractitionerFileShares(practitionerFileShares);
responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
return responseVO;
}
}
yd-api/src/main/java/com/yd/api/agms/vo/practitioner/PractitionerFileSharing.java 0 → 100644
package com.yd.api.agms.vo.practitioner;
import java.util.Date;
/**
* @author xxy
*/
public class PractitionerFileSharing {
/**
* serial id
*/
private Long id;
/**
* FK ag_md_drop_options_id文章分类
*/
private Long mdDropOptionId;
private String mdDropOptionName;
/**
* 文章内容html
*/
private String fileContent;
/**
* 0=No, 1=Yes
*/
private Integer isActive;
/**
* 建置时间
*/
private String createdAt;
private Long createdBy;
private String createdName;
/**
* 更改时间
*/
private String updatedAt;
private Long updatedBy;
private String updatedName;
/**
* 获取 serial id
*
* @return the id serial id
*/
public Long getId() {
return this.id;
}
/**
* 设置 serial id
*
* @param id the serial id to set
*/
public void setId(Long id) {
this.id = id;
}
/**
* 获取 FK ag_md_drop_options_id文章分类
*
* @return the mdDropOptionId FK ag_md_drop_options_id文章分类
*/
public Long getMdDropOptionId() {
return this.mdDropOptionId;
}
/**
* 设置 FK ag_md_drop_options_id文章分类
*
* @param mdDropOptionId the FK ag_md_drop_options_id文章分类 to set
*/
public void setMdDropOptionId(Long mdDropOptionId) {
this.mdDropOptionId = mdDropOptionId;
}
/**
* 获取
*
* @return the mdDropOptionName
*/
public String getMdDropOptionName() {
return this.mdDropOptionName;
}
/**
* 设置
*
* @param mdDropOptionName the to set
*/
public void setMdDropOptionName(String mdDropOptionName) {
this.mdDropOptionName = mdDropOptionName;
}
/**
* 获取 文章内容html
*
* @return the fileContent 文章内容html
*/
public String getFileContent() {
return this.fileContent;
}
/**
* 设置 文章内容html
*
* @param fileContent the 文章内容html to set
*/
public void setFileContent(String fileContent) {
this.fileContent = fileContent;
}
/**
* 获取 0=No 1=Yes
*
* @return the isActive 0=No 1=Yes
*/
public Integer getIsActive() {
return this.isActive;
}
/**
* 设置 0=No 1=Yes
*
* @param isActive the 0=No 1=Yes to set
*/
public void setIsActive(Integer isActive) {
this.isActive = isActive;
}
/**
* 获取 建置时间
*
* @return the createdAt 建置时间
*/
public String getCreatedAt() {
return this.createdAt;
}
/**
* 设置 建置时间
*
* @param createdAt the 建置时间 to set
*/
public void setCreatedAt(String createdAt) {
this.createdAt = createdAt;
}
/**
* 获取
*
* @return the createdBy
*/
public Long getCreatedBy() {
return this.createdBy;
}
/**
* 设置
*
* @param createdBy the to set
*/
public void setCreatedBy(Long createdBy) {
this.createdBy = createdBy;
}
/**
* 获取
*
* @return the createdName
*/
public String getCreatedName() {
return this.createdName;
}
/**
* 设置
*
* @param createdName the to set
*/
public void setCreatedName(String createdName) {
this.createdName = createdName;
}
/**
* 获取 更改时间
*
* @return the updatedAt 更改时间
*/
public String getUpdatedAt() {
return this.updatedAt;
}
/**
* 设置 更改时间
*
* @param updatedAt the 更改时间 to set
*/
public void setUpdatedAt(String updatedAt) {
this.updatedAt = updatedAt;
}
/**
* 获取
*
* @return the updatedBy
*/
public Long getUpdatedBy() {
return this.updatedBy;
}
/**
* 设置
*
* @param updatedBy the to set
*/
public void setUpdatedBy(Long updatedBy) {
this.updatedBy = updatedBy;
}
/**
* 获取
*
* @return the updatedName
*/
public String getUpdatedName() {
return this.updatedName;
}
/**
* 设置
*
* @param updatedName the to set
*/
public void setUpdatedName(String updatedName) {
this.updatedName = updatedName;
}
@Override
public String toString() {
return "PractitionerFileSharing{" +
"id=" + id +
", mdDropOptionId=" + mdDropOptionId +
", mdDropOptionName='" + mdDropOptionName + '\'' +
", fileContent='" + fileContent + '\'' +
", isActive=" + isActive +
", createdAt=" + createdAt +
", createdBy=" + createdBy +
", createdName='" + createdName + '\'' +
", updatedAt=" + updatedAt +
", updatedBy=" + updatedBy +
", updatedName='" + updatedName + '\'' +
'}';
}
}
yd-api/src/main/java/com/yd/api/agms/vo/practitioner/PractitionerFileSharingListRequestVO.java 0 → 100644
package com.yd.api.agms.vo.practitioner;
import com.github.pagehelper.PageInfo;
/**
* @author xxy
*/
public class PractitionerFileSharingListRequestVO {
private Long mdDropOptionId;
private Integer isActive;
private PageInfo<PractitionerFileSharing> practitionerFileShares;
/**
* 获取
*
* @return the mdDropOptionId
*/
public Long getMdDropOptionId() {
return this.mdDropOptionId;
}
/**
* 设置
*
* @param mdDropOptionId the to set
*/
public void setMdDropOptionId(Long mdDropOptionId) {
this.mdDropOptionId = mdDropOptionId;
}
/**
* 获取
*
* @return the isActive
*/
public Integer getIsActive() {
return this.isActive;
}
/**
* 设置
*
* @param isActive the to set
*/
public void setIsActive(Integer isActive) {
this.isActive = isActive;
}
/**
* 获取
*
* @return the practitionerFileShares
*/
public PageInfo<PractitionerFileSharing> getPractitionerFileShares() {
return this.practitionerFileShares;
}
/**
* 设置
*
* @param practitionerFileShares the to set
*/
public void setPractitionerFileShares(PageInfo<PractitionerFileSharing> practitionerFileShares) {
this.practitionerFileShares = practitionerFileShares;
}
@Override
public String toString() {
return "PractitionerFileSharingListRequestVO{" +
"mdDropOptionId=" + mdDropOptionId +
", isActive=" + isActive +
", practitionerFileShares=" + practitionerFileShares +
'}';
}
}
yd-api/src/main/java/com/yd/api/agms/vo/practitioner/PractitionerFileSharingListResponseVO.java 0 → 100644
package com.yd.api.agms.vo.practitioner;
import com.github.pagehelper.PageInfo;
import com.yd.api.result.CommonResult;
import java.util.List;
/**
* @author xxy
*/
public class PractitionerFileSharingListResponseVO {
private PageInfo<PractitionerFileSharing> practitionerFileShares;
private CommonResult commonResult;
/**
* 获取
*
* @return the practitionerFileSharings
*/
public PageInfo<PractitionerFileSharing> getPractitionerFileShares() {
return this.practitionerFileShares;
}
/**
* 设置
*
* @param practitionerFileShares the to set
*/
public void setPractitionerFileShares(PageInfo<PractitionerFileSharing> practitionerFileShares) {
this.practitionerFileShares = practitionerFileShares;
}
/**
* 获取
*
* @return the commonResult
*/
public CommonResult getCommonResult() {
return this.commonResult;
}
/**
* 设置
*
* @param commonResult the to set
*/
public void setCommonResult(CommonResult commonResult) {
this.commonResult = commonResult;
}
@Override
public String toString() {
return "PractitionerFileSharingListResponseVO{" +
"practitionerFileShares=" + practitionerFileShares +
", commonResult=" + commonResult +
'}';
}
}
yd-api/src/main/java/com/yd/api/agms/vo/practitioner/PractitionerFileSharingSaveRequestVO.java 0 → 100644
package com.yd.api.agms.vo.practitioner;
import java.util.Date;
/**
* @author xxy
*/
public class PractitionerFileSharingSaveRequestVO {
/**
* serial id
*/
private Long id;
/**
* FK ag_md_drop_options_id文章分类
*/
private Long mdDropOptionId;
/**
* 文章内容html
*/
private String fileContent;
/**
* 0=No, 1=Yes
*/
private Integer isActive;
private Long loginId;
/**
* 获取 serial id
*
* @return the id serial id
*/
public Long getId() {
return this.id;
}
/**
* 设置 serial id
*
* @param id the serial id to set
*/
public void setId(Long id) {
this.id = id;
}
/**
* 获取 FK ag_md_drop_options_id文章分类
*
* @return the mdDropOptionId FK ag_md_drop_options_id文章分类
*/
public Long getMdDropOptionId() {
return this.mdDropOptionId;
}
/**
* 设置 FK ag_md_drop_options_id文章分类
*
* @param mdDropOptionId the FK ag_md_drop_options_id文章分类 to set
*/
public void setMdDropOptionId(Long mdDropOptionId) {
this.mdDropOptionId = mdDropOptionId;
}
/**
* 获取 文章内容html
*
* @return the fileContent 文章内容html
*/
public String getFileContent() {
return this.fileContent;
}
/**
* 设置 文章内容html
*
* @param fileContent the 文章内容html to set
*/
public void setFileContent(String fileContent) {
this.fileContent = fileContent;
}
/**
* 获取 0=No 1=Yes
*
* @return the isActive 0=No 1=Yes
*/
public Integer getIsActive() {
return this.isActive;
}
/**
* 设置 0=No 1=Yes
*
* @param isActive the 0=No 1=Yes to set
*/
public void setIsActive(Integer isActive) {
this.isActive = isActive;
}
/**
* 获取
*
* @return the loginId
*/
public Long getLoginId() {
return this.loginId;
}
/**
* 设置
*
* @param loginId the to set
*/
public void setLoginId(Long loginId) {
this.loginId = loginId;
}
@Override
public String toString() {
return "PractitionerFileSharingSaveRequestVO{" +
"id=" + id +
", mdDropOptionId=" + mdDropOptionId +
", fileContent='" + fileContent + '\'' +
", isActive=" + isActive +
", loginId=" + loginId +
'}';
}
}
yd-api/src/main/java/com/yd/api/agms/vo/practitioner/PractitionerFileSharingSaveResponseVO.java 0 → 100644
package com.yd.api.agms.vo.practitioner;
import com.yd.api.result.CommonResult;
/**
* @author xxy
*/
public class PractitionerFileSharingSaveResponseVO {
private Long id;
private CommonResult commonResult;
/**
* 获取
*
* @return the id
*/
public Long getId() {
return this.id;
}
/**
* 设置
*
* @param id the to set
*/
public void setId(Long id) {
this.id = id;
}
/**
* 获取
*
* @return the commonResult
*/
public CommonResult getCommonResult() {
return this.commonResult;
}
/**
* 设置
*
* @param commonResult the to set
*/
public void setCommonResult(CommonResult commonResult) {
this.commonResult = commonResult;
}
@Override
public String toString() {
return "PractitionerFileSharingSaveResponseVO{" +
"id=" + id +
", commonResult=" + commonResult +
'}';
}
}
yd-api/src/main/java/com/yd/api/practitioner/PractitionerPDFTest.java
......@@ -164,7 +164,8 @@ public class PractitionerPDFTest {
String templatePDF = "D:\\pcs12\\templatePractitionerContract.pdf";
templatePDF = PDFConfiguration.getProperty("pdf.template");
//模板文件生成零时文件
String tmpPathPDF = PDFConfiguration.getProperty("pdf.temp.path");
String tmpPathPDF = "D:\\pcs12";
tmpPathPDF = PDFConfiguration.getProperty("pdf.temp.path");
String practitionerNO = "SH000012";
//PDF模板输出结果文件
......@@ -186,7 +187,7 @@ public class PractitionerPDFTest {
signResultPDF = tmpPathPDF + practitionerNO + "-signedYD.pdf";
String password="UC645YlB";
password = readFileTxt(PDFConfiguration.getProperty("pdf.keyPasswordFile"));
//password = readFileTxt(PDFConfiguration.getProperty("pdf.keyPasswordFile"));
String keyStorePath="D:\\pcs12\\4929078_m.zuihuibi.cn.pfx";
keyStorePath = PDFConfiguration.getProperty("pdf.keyStorePath");;
......
yd-api/src/main/java/com/yd/api/practitioner/vo/Commission.java 0 → 100644
package com.yd.api.practitioner.vo;
public class Commission {
public String getInsurer() {
return insurer;
}
public void setInsurer(String insurer) {
this.insurer = insurer;
}
private String insurer;
public String getPolicyNo() {
return policyNo;
}
public void setPolicyNo(String policyNo) {
this.policyNo = policyNo;
}
private String policyNo;
public String getEffectiveDate() {
return effectiveDate;
}
public void setEffectiveDate(String effectiveDate) {
this.effectiveDate = effectiveDate;
}
private String effectiveDate;
public String getProductCode() {
return productCode;
}
public void setProductCode(String productCode) {
this.productCode = productCode;
}
private String productCode;
public String getSubSystem() {
return subSystem;
}
public void setSubSystem(String subSystem) {
this.subSystem = subSystem;
}
private String subSystem;
public String getInsured() {
return insured;
}
public void setInsured(String insured) {
this.insured = insured;
}
private String insured;
public String getYearMonth() {
return yearMonth;
}
public void setYearMonth(String yearMonth) {
this.yearMonth = yearMonth;
}
private String yearMonth;
public String getPremium() {
return premium;
}
public void setPremium(String premium) {
this.premium = premium;
}
private String premium;
public String getFyc() {
return fyc;
}
public void setFyc(String fyc) {
this.fyc = fyc;
}
private String fyc;
public String getGradeRate() {
return gradeRate;
}
public void setGradeRate(String gradeRate) {
this.gradeRate = gradeRate;
}
private String gradeRate;
public String getCommission() {
return commission;
}
public void setCommission(String commission) {
this.commission = commission;
}
private String commission;
public String getNote() {
return note;
}
public void setNote(String note) {
this.note = note;
}
private String note;
}
yd-api/src/main/java/com/yd/api/practitioner/vo/CommissionItems.java 0 → 100644
package com.yd.api.practitioner.vo;
import java.util.List;
public class CommissionItems {
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
private String name;
public List<Commission> getItems() {
return items;
}
public void setItems(List<Commission> items) {
this.items = items;
}
private List<Commission> items;
}
yd-api/src/main/java/com/yd/dal/entity/customer/AclPractitionerFileSharing.java 0 → 100644
package com.yd.dal.entity.customer;
import java.util.Date;
import lombok.Data;
/**
* 经纪人分享文章表
*/
@Data
public class AclPractitionerFileSharing {
/**
* serial id
*/
private Long id;
/**
* FK ag_md_drop_options_id文章分类
*/
private Long mdDropOptionId;
/**
* 文章内容html
*/
private String fileContent;
/**
* 0=No, 1=Yes
*/
private Integer isActive;
/**
* 建置时间
*/
private Date createdAt;
private Long createdBy;
/**
* 更改时间
*/
private Date updatedAt;
private Long updatedBy;
}
\ No newline at end of file
yd-api/src/main/java/com/yd/dal/mapper/agms/AgmsPractitionerMapper.java 0 → 100644
package com.yd.dal.mapper.agms;
import com.github.pagehelper.Page;
import com.yd.api.agms.vo.practitioner.PractitionerFileSharing;
import org.apache.ibatis.annotations.Param;
/**
* @author xxy
*/
public interface AgmsPractitionerMapper {
/**
*
* @param mdDropOptionId 文章类型
* @param isActive 是否启用
* @return
*/
Page<PractitionerFileSharing> practitionerFileSharingList(@Param("mdDropOptionId") Long mdDropOptionId ,@Param("isActive") Integer isActive);
}
yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerFileSharingMapper.java 0 → 100644
package com.yd.dal.mapper.customer;
import com.yd.dal.entity.customer.AclPractitionerFileSharing;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface AclPractitionerFileSharingMapper {
int deleteByPrimaryKey(Long id);
int insert(AclPractitionerFileSharing record);
int insertSelective(AclPractitionerFileSharing record);
AclPractitionerFileSharing selectByPrimaryKey(Long id);
int updateByPrimaryKeySelective(AclPractitionerFileSharing record);
int updateByPrimaryKey(AclPractitionerFileSharing record);
int updateBatch(List<AclPractitionerFileSharing> list);
int updateBatchSelective(List<AclPractitionerFileSharing> list);
int batchInsert(@Param("list") List<AclPractitionerFileSharing> list);
}
\ No newline at end of file
yd-api/src/main/java/com/yd/dal/service/agms/AgmsPractitionerDALService.java 0 → 100644
package com.yd.dal.service.agms;
import com.github.pagehelper.PageInfo;
import com.yd.api.agms.vo.practitioner.PractitionerFileSharing;
/**
* @author xxy
*/
public interface AgmsPractitionerDALService {
/**
*
* @param mdDropOptionId 文章类型id
* @param pageNum 当前页
* @param size 每页的数量
* @return 查询结果
*/
PageInfo<PractitionerFileSharing> practitionerFileSharingList(Long mdDropOptionId, Integer isActive, int pageNum, int size);
}
yd-api/src/main/java/com/yd/dal/service/agms/impl/AgmsPractitionerDALServiceImpl.java 0 → 100644
package com.yd.dal.service.agms.impl;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.yd.api.agms.vo.practitioner.PractitionerFileSharing;
import com.yd.dal.mapper.agms.AgmsPractitionerMapper;
import com.yd.dal.service.agms.AgmsPractitionerDALService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* @author xxy
*/
@Service("agmsPractitionerDALService")
public class AgmsPractitionerDALServiceImpl implements AgmsPractitionerDALService {
@Autowired
private AgmsPractitionerMapper mapper;
@Override
public PageInfo<PractitionerFileSharing> practitionerFileSharingList(Long mdDropOptionId, Integer isActive, int pageNum, int size) {
PageHelper.startPage(pageNum, size);
Page<PractitionerFileSharing> practitionerFileShares = mapper.practitionerFileSharingList(mdDropOptionId,isActive);
PageInfo<PractitionerFileSharing> pageInfo = new PageInfo<>(practitionerFileShares);
return pageInfo;
}
}
yd-api/src/main/java/com/yd/dal/service/customer/AclPractitionerFileSharingDALService.java 0 → 100644
package com.yd.dal.service.customer;
import com.yd.dal.entity.customer.AclPractitionerFileSharing;
/**
* @author xxy
*/
public interface AclPractitionerFileSharingDALService {
/**
* 修改或保存
* @param fileSharing 修改保存的数据
* @return id
*/
Long saveOrUpdate(AclPractitionerFileSharing fileSharing);
}
yd-api/src/main/java/com/yd/dal/service/customer/impl/AclPractitionerFileSharingDALServiceImpl.java 0 → 100644
package com.yd.dal.service.customer.impl;
import com.yd.dal.entity.customer.AclPractitionerFileSharing;
import com.yd.dal.mapper.customer.AclPractitionerFileSharingMapper;
import com.yd.dal.service.customer.AclPractitionerFileSharingDALService;
import com.yd.util.CommonUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
/**
* @author xxy
*/
@Service("aclPractitionerFileSharingDALService")
public class AclPractitionerFileSharingDALServiceImpl implements AclPractitionerFileSharingDALService {
@Resource
private AclPractitionerFileSharingMapper mapper;
@Override
public Long saveOrUpdate(AclPractitionerFileSharing fileSharing) {
if (CommonUtil.isNullOrZero(fileSharing.getId())){
//没有id做保存
fileSharing.setCreatedAt(new Date());
fileSharing.setUpdatedAt(new Date());
fileSharing.setCreatedBy(fileSharing.getUpdatedBy());
mapper.insert(fileSharing);
}else {
//有id,做更新
fileSharing.setUpdatedAt(new Date());
mapper.updateByPrimaryKeySelective(fileSharing);
}
return fileSharing.getId();
}
}
yd-api/src/main/resources/mapper/agms/AgmsPractitionerMapper.xml 0 → 100644
<?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.yd.dal.mapper.agms.AgmsPractitionerMapper">
<select id="practitionerFileSharingList" resultType="com.yd.api.agms.vo.practitioner.PractitionerFileSharing">
select s.id id,
s.md_drop_option_id mdDropOptionId,
o.drop_option_name dropOptionName,
s.file_content fileContent,
s.is_active isActive,
s.created_at createdAt,
s.created_by createdBy,
uc.name createdName,
s.updated_at updatedAt,
s.updated_by updatedBy,
uu.name updatedName
from ag_acl_practitioner_file_sharing s
left join ag_md_drop_options o on o.id = s.md_drop_option_id
left join ag_acl_user uc on uc.id = s.created_by
left join ag_acl_user uu on uu.id = s.created_by
<where>
<if test="mdDropOptionId != null">
s.md_drop_option_id = #{mdDropOptionId,jdbcType=BIGINT}
</if>
<if test="isActive != null">
and s.is_active = #{isActive,jdbcType=INTEGER}
</if>
</where>
</select>
</mapper>
\ No newline at end of file
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 to comment