Skip to content

O
one-certificate-system
Commit 4db4908b authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加水印图片

parent e360cee1
Hide whitespace changes
Inline Side-by-side
Showing with 330 additions and 25 deletions
one-certificate-manager/db/add_db.sql
View file @ 4db4908b
...@@ -86,4 +86,11 @@ ALTER TABLE mortals_xhx_certificate_child ...@@ -86,4 +86,11 @@ ALTER TABLE mortals_xhx_certificate_child
ALTER TABLE `mortals_xhx_apply_log` ALTER TABLE `mortals_xhx_apply_log`
ADD COLUMN `watermarkUrl` varchar(255) DEFAULT '' COMMENT '水印图片地址' ADD COLUMN `watermarkUrl` varchar(255) DEFAULT '' COMMENT '水印图片地址'
AFTER annexUrl ; AFTER annexUrl ;
\ No newline at end of file
ALTER TABLE `mortals_xhx_child_license`
ADD COLUMN `originalWaterMarkPath` varchar(255) DEFAULT '' COMMENT '水印图片地址',
ADD COLUMN `copyWaterMarkPath` varchar(255) DEFAULT '' COMMENT '水印图片地址'
AFTER copyFilePath ;
\ No newline at end of file
one-certificate-manager/src/main/java/com/mortals/xhx/busiz/web/TestSendMsgController.java
View file @ 4db4908b
...@@ -6,12 +6,16 @@ import com.mortals.framework.common.Rest; ...@@ -6,12 +6,16 @@ import com.mortals.framework.common.Rest;
import com.mortals.xhx.base.system.upload.service.UploadService; import com.mortals.xhx.base.system.upload.service.UploadService;
import com.mortals.xhx.common.key.Constant; import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.common.utils.WatermarkImgUtils; import com.mortals.xhx.common.utils.WatermarkImgUtils;
import com.mortals.xhx.module.child.model.ChildLicenseEntity;
import com.mortals.xhx.module.child.model.ChildLicenseQuery;
import com.mortals.xhx.module.child.service.ChildLicenseService;
import com.mortals.xhx.module.device.model.DeviceEntity; import com.mortals.xhx.module.device.model.DeviceEntity;
import com.mortals.xhx.module.device.model.DeviceQuery; import com.mortals.xhx.module.device.model.DeviceQuery;
import com.mortals.xhx.module.record.model.ApplyLogEntity; import com.mortals.xhx.module.record.model.ApplyLogEntity;
import com.mortals.xhx.module.record.model.ApplyLogQuery; import com.mortals.xhx.module.record.model.ApplyLogQuery;
import com.mortals.xhx.module.record.service.ApplyLogService; import com.mortals.xhx.module.record.service.ApplyLogService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -31,6 +35,9 @@ public class TestSendMsgController { ...@@ -31,6 +35,9 @@ public class TestSendMsgController {
private ApplyLogService applyLogService; private ApplyLogService applyLogService;
@Autowired @Autowired
private UploadService uploadService; private UploadService uploadService;
@Autowired
private ChildLicenseService childLicenseService;
@GetMapping("refreshWaterMark") @GetMapping("refreshWaterMark")
public Rest<Void> updateDevice() { public Rest<Void> updateDevice() {
...@@ -38,7 +45,7 @@ public class TestSendMsgController { ...@@ -38,7 +45,7 @@ public class TestSendMsgController {
String WarterMark = GlobalSysInfo.getParamValue(Constant.Param_waterMark, ""); String WarterMark = GlobalSysInfo.getParamValue(Constant.Param_waterMark, "");
ApplyLogQuery applyLogQuery = new ApplyLogQuery(); ApplyLogQuery applyLogQuery = new ApplyLogQuery();
applyLogQuery.setAnnexUrlNotList(Arrays.asList("")); applyLogQuery.setAnnexUrlNotList(Arrays.asList(""));
List<ApplyLogEntity> applyLogEntities = applyLogService.find(applyLogQuery.watermarkUrlList(Arrays.asList(""))); List<ApplyLogEntity> applyLogEntities = applyLogService.find(applyLogQuery);
for (ApplyLogEntity applyLogEntity : applyLogEntities) { for (ApplyLogEntity applyLogEntity : applyLogEntities) {
if (!ObjectUtils.isEmpty(WarterMark)) { if (!ObjectUtils.isEmpty(WarterMark)) {
//生成水印图片 //生成水印图片
...@@ -58,6 +65,55 @@ public class TestSendMsgController { ...@@ -58,6 +65,55 @@ public class TestSendMsgController {
if (!ObjectUtils.isEmpty(applyLogEntities)) { if (!ObjectUtils.isEmpty(applyLogEntities)) {
applyLogService.update(applyLogEntities); applyLogService.update(applyLogEntities);
} }
ChildLicenseQuery childLicenseQuery = new ChildLicenseQuery();
childLicenseQuery.setOriginalFilePathNotList(Arrays.asList(""));
List<ChildLicenseEntity> childLicenseEntities = childLicenseService.find(childLicenseQuery);
for (ChildLicenseEntity childLicenseEntity : childLicenseEntities) {
if (!ObjectUtils.isEmpty(WarterMark)) {
String originalFilePath = childLicenseEntity.getOriginalFilePath();
String originalAllPath = uploadService.getFilePath(originalFilePath);
String targetPath = "/file/fileupload/" + new Date().getTime() + "_watermark.jpg";
String targetAllPath = uploadService.getFilePath(targetPath);
if (FileUtil.exist(originalAllPath)) {
WatermarkImgUtils.addWatermark(originalAllPath,
targetAllPath,
WarterMark, "jpg");
}
childLicenseEntity.setOriginalWaterMarkPath(targetPath);
}
}
if (!ObjectUtils.isEmpty(childLicenseEntities)) {
childLicenseService.update(childLicenseEntities);
}
childLicenseQuery = new ChildLicenseQuery();
childLicenseQuery.setCopyFilePathNotList(Arrays.asList(""));
childLicenseEntities = childLicenseService.find(childLicenseQuery);
for (ChildLicenseEntity childLicenseEntity : childLicenseEntities) {
if (!ObjectUtils.isEmpty(WarterMark)) {
String originalFilePath = childLicenseEntity.getOriginalFilePath();
String originalAllPath = uploadService.getFilePath(originalFilePath);
String targetPath = "/file/fileupload/" + new Date().getTime() + "_watermark.jpg";
String targetAllPath = uploadService.getFilePath(targetPath);
if (FileUtil.exist(originalAllPath)) {
WatermarkImgUtils.addWatermark(originalAllPath,
targetAllPath,
WarterMark, "jpg");
}
childLicenseEntity.setCopyWaterMarkPath(targetPath);
}
}
if (!ObjectUtils.isEmpty(childLicenseEntities)) {
childLicenseService.update(childLicenseEntities);
}
return Rest.ok(); return Rest.ok();
} }
......
one-certificate-manager/src/main/java/com/mortals/xhx/module/child/model/ChildLicenseEntity.java
View file @ 4db4908b
...@@ -14,7 +14,7 @@ import lombok.Data; ...@@ -14,7 +14,7 @@ import lombok.Data;
* 行业许可子证实体对象 * 行业许可子证实体对象
* *
* @author zxfei * @author zxfei
* @date 2024-07-30 * @date 2024-08-08
*/ */
@Data @Data
public class ChildLicenseEntity extends ChildLicenseVo { public class ChildLicenseEntity extends ChildLicenseVo {
...@@ -192,6 +192,14 @@ public class ChildLicenseEntity extends ChildLicenseVo { ...@@ -192,6 +192,14 @@ public class ChildLicenseEntity extends ChildLicenseVo {
* 子证状态(0.禁用,1.启用) * 子证状态(0.禁用,1.启用)
*/ */
private Integer childStatus; private Integer childStatus;
/**
* 正本文件水印相对路径地址
*/
private String originalWaterMarkPath;
/**
* 副本文件水印相对路径地址
*/
private String copyWaterMarkPath;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -252,5 +260,7 @@ public class ChildLicenseEntity extends ChildLicenseVo { ...@@ -252,5 +260,7 @@ public class ChildLicenseEntity extends ChildLicenseVo {
this.ext7 = ""; this.ext7 = "";
this.ext8 = ""; this.ext8 = "";
this.childStatus = 1; this.childStatus = 1;
this.originalWaterMarkPath = "";
this.copyWaterMarkPath = "";
} }
} }
\ No newline at end of file
one-certificate-manager/src/main/java/com/mortals/xhx/module/child/model/ChildLicenseQuery.java
View file @ 4db4908b
...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.child.model.ChildLicenseEntity; ...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.child.model.ChildLicenseEntity;
* 行业许可子证查询对象 * 行业许可子证查询对象
* *
* @author zxfei * @author zxfei
* @date 2024-07-30 * @date 2024-08-08
*/ */
public class ChildLicenseQuery extends ChildLicenseEntity { public class ChildLicenseQuery extends ChildLicenseEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
...@@ -374,6 +374,16 @@ public class ChildLicenseQuery extends ChildLicenseEntity { ...@@ -374,6 +374,16 @@ public class ChildLicenseQuery extends ChildLicenseEntity {
/** 子证状态(0.禁用,1.启用)排除列表 */ /** 子证状态(0.禁用,1.启用)排除列表 */
private List <Integer> childStatusNotList; private List <Integer> childStatusNotList;
/** 正本文件水印相对路径地址 */
private List<String> originalWaterMarkPathList;
/** 正本文件水印相对路径地址排除列表 */
private List <String> originalWaterMarkPathNotList;
/** 副本文件水印相对路径地址 */
private List<String> copyWaterMarkPathList;
/** 副本文件水印相对路径地址排除列表 */
private List <String> copyWaterMarkPathNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<ChildLicenseQuery> orConditionList; private List<ChildLicenseQuery> orConditionList;
...@@ -2506,6 +2516,70 @@ public class ChildLicenseQuery extends ChildLicenseEntity { ...@@ -2506,6 +2516,70 @@ public class ChildLicenseQuery extends ChildLicenseEntity {
} }
/**
* 获取 正本文件水印相对路径地址
* @return originalWaterMarkPathList
*/
public List<String> getOriginalWaterMarkPathList(){
return this.originalWaterMarkPathList;
}
/**
* 设置 正本文件水印相对路径地址
* @param originalWaterMarkPathList
*/
public void setOriginalWaterMarkPathList(List<String> originalWaterMarkPathList){
this.originalWaterMarkPathList = originalWaterMarkPathList;
}
/**
* 获取 正本文件水印相对路径地址
* @return originalWaterMarkPathNotList
*/
public List<String> getOriginalWaterMarkPathNotList(){
return this.originalWaterMarkPathNotList;
}
/**
* 设置 正本文件水印相对路径地址
* @param originalWaterMarkPathNotList
*/
public void setOriginalWaterMarkPathNotList(List<String> originalWaterMarkPathNotList){
this.originalWaterMarkPathNotList = originalWaterMarkPathNotList;
}
/**
* 获取 副本文件水印相对路径地址
* @return copyWaterMarkPathList
*/
public List<String> getCopyWaterMarkPathList(){
return this.copyWaterMarkPathList;
}
/**
* 设置 副本文件水印相对路径地址
* @param copyWaterMarkPathList
*/
public void setCopyWaterMarkPathList(List<String> copyWaterMarkPathList){
this.copyWaterMarkPathList = copyWaterMarkPathList;
}
/**
* 获取 副本文件水印相对路径地址
* @return copyWaterMarkPathNotList
*/
public List<String> getCopyWaterMarkPathNotList(){
return this.copyWaterMarkPathNotList;
}
/**
* 设置 副本文件水印相对路径地址
* @param copyWaterMarkPathNotList
*/
public void setCopyWaterMarkPathNotList(List<String> copyWaterMarkPathNotList){
this.copyWaterMarkPathNotList = copyWaterMarkPathNotList;
}
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param id * @param id
...@@ -3766,6 +3840,44 @@ public class ChildLicenseQuery extends ChildLicenseEntity { ...@@ -3766,6 +3840,44 @@ public class ChildLicenseQuery extends ChildLicenseEntity {
return this; return this;
} }
/**
* 设置 正本文件水印相对路径地址
* @param originalWaterMarkPath
*/
public ChildLicenseQuery originalWaterMarkPath(String originalWaterMarkPath){
setOriginalWaterMarkPath(originalWaterMarkPath);
return this;
}
/**
* 设置 正本文件水印相对路径地址
* @param originalWaterMarkPathList
*/
public ChildLicenseQuery originalWaterMarkPathList(List<String> originalWaterMarkPathList){
this.originalWaterMarkPathList = originalWaterMarkPathList;
return this;
}
/**
* 设置 副本文件水印相对路径地址
* @param copyWaterMarkPath
*/
public ChildLicenseQuery copyWaterMarkPath(String copyWaterMarkPath){
setCopyWaterMarkPath(copyWaterMarkPath);
return this;
}
/**
* 设置 副本文件水印相对路径地址
* @param copyWaterMarkPathList
*/
public ChildLicenseQuery copyWaterMarkPathList(List<String> copyWaterMarkPathList){
this.copyWaterMarkPathList = copyWaterMarkPathList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
one-certificate-manager/src/main/java/com/mortals/xhx/module/child/service/impl/ChildLicenseServiceImpl.java
View file @ 4db4908b
package com.mortals.xhx.module.child.service.impl; package com.mortals.xhx.module.child.service.impl;
import cn.hutool.core.io.FileUtil;
import com.mortals.framework.ap.GlobalSysInfo;
import com.mortals.xhx.base.system.upload.service.UploadService;
import com.mortals.xhx.common.code.ProcessStatusEnum; import com.mortals.xhx.common.code.ProcessStatusEnum;
import com.mortals.xhx.common.code.StatusEnum; import com.mortals.xhx.common.code.StatusEnum;
import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.common.utils.WatermarkImgUtils;
import com.mortals.xhx.module.certificate.model.CertificateChildEntity; import com.mortals.xhx.module.certificate.model.CertificateChildEntity;
import com.mortals.xhx.module.certificate.model.CertificateChildQuery; import com.mortals.xhx.module.certificate.model.CertificateChildQuery;
import com.mortals.xhx.module.certificate.model.CertificateDocumentEntity; import com.mortals.xhx.module.certificate.model.CertificateDocumentEntity;
...@@ -28,12 +34,12 @@ import lombok.extern.slf4j.Slf4j; ...@@ -28,12 +34,12 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
/** /**
* ChildLicenseService * ChildLicenseService
* 行业许可子证 service实现 * 行业许可子证 service实现
* *
* @author zxfei * @author zxfei
* @date 2024-07-28 * @date 2024-07-28
*/ */
@Service("childLicenseService") @Service("childLicenseService")
@Slf4j @Slf4j
public class ChildLicenseServiceImpl extends AbstractCRUDServiceImpl<ChildLicenseDao, ChildLicenseEntity, Long> implements ChildLicenseService { public class ChildLicenseServiceImpl extends AbstractCRUDServiceImpl<ChildLicenseDao, ChildLicenseEntity, Long> implements ChildLicenseService {
...@@ -42,25 +48,29 @@ public class ChildLicenseServiceImpl extends AbstractCRUDServiceImpl<ChildLicens ...@@ -42,25 +48,29 @@ public class ChildLicenseServiceImpl extends AbstractCRUDServiceImpl<ChildLicens
private CertificateChildService certificateChildService; private CertificateChildService certificateChildService;
@Autowired @Autowired
private CertificateDocumentService certificateDocumentService; private CertificateDocumentService certificateDocumentService;
@Autowired
private UploadService uploadService;
@Override @Override
public int createChildLicense(ApplyLogEntity applyLogEntity, Long oldId, Context context) throws AppException { public int createChildLicense(ApplyLogEntity applyLogEntity, Long oldId, Context context) throws AppException {
int result = 0; int result = 0;
if(applyLogEntity.getCatalogId()!=null) { if (applyLogEntity.getCatalogId() != null) {
Map<Long,Long> documentIdMap = new HashMap<>(); Map<Long, Long> documentIdMap = new HashMap<>();
if(CollectionUtils.isNotEmpty(applyLogEntity.getChildCertificate())){ if (CollectionUtils.isNotEmpty(applyLogEntity.getChildCertificate())) {
applyLogEntity.getChildCertificate().forEach(i->{ applyLogEntity.getChildCertificate().forEach(i -> {
if(i.getStatus()==1){ if (i.getStatus() == 1) {
documentIdMap.put(i.getId(),i.getId()); documentIdMap.put(i.getId(), i.getId());
} }
}); });
} }
boolean isAdd = true; boolean isAdd = true;
if(oldId!=null){ if (oldId != null) {
List<ChildLicenseEntity> oldChildList = this.find(new ChildLicenseQuery().applyId(oldId)); List<ChildLicenseEntity> oldChildList = this.find(new ChildLicenseQuery().applyId(oldId));
if(CollectionUtils.isNotEmpty(oldChildList)){ if (CollectionUtils.isNotEmpty(oldChildList)) {
isAdd = false; isAdd = false;
} }
for(ChildLicenseEntity child:oldChildList){ for (ChildLicenseEntity child : oldChildList) {
child.setApplyId(applyLogEntity.getId()); child.setApplyId(applyLogEntity.getId());
if (documentIdMap.size() > 0 && documentIdMap.containsKey(child.getDocumentId())) { if (documentIdMap.size() > 0 && documentIdMap.containsKey(child.getDocumentId())) {
child.setChildStatus(StatusEnum.ENABLE.getValue()); child.setChildStatus(StatusEnum.ENABLE.getValue());
...@@ -70,10 +80,10 @@ public class ChildLicenseServiceImpl extends AbstractCRUDServiceImpl<ChildLicens ...@@ -70,10 +80,10 @@ public class ChildLicenseServiceImpl extends AbstractCRUDServiceImpl<ChildLicens
} }
this.update(oldChildList); this.update(oldChildList);
} }
if(isAdd) { if (isAdd) {
List<CertificateChildEntity> childEntityList = certificateChildService.find(new CertificateChildQuery().catalogId(applyLogEntity.getCatalogId())); List<CertificateChildEntity> childEntityList = certificateChildService.find(new CertificateChildQuery().catalogId(applyLogEntity.getCatalogId()));
List<Long> documentIdList = childEntityList.stream().map(CertificateChildEntity::getDocumentId).collect(Collectors.toList()); List<Long> documentIdList = childEntityList.stream().map(CertificateChildEntity::getDocumentId).collect(Collectors.toList());
if(ObjectUtils.isEmpty(documentIdList)) return result; if (ObjectUtils.isEmpty(documentIdList)) return result;
CertificateDocumentQuery certificateDocumentQuery = new CertificateDocumentQuery(); CertificateDocumentQuery certificateDocumentQuery = new CertificateDocumentQuery();
certificateDocumentQuery.setIdList(documentIdList); certificateDocumentQuery.setIdList(documentIdList);
List<CertificateDocumentEntity> documentEntityList = certificateDocumentService.find(certificateDocumentQuery); List<CertificateDocumentEntity> documentEntityList = certificateDocumentService.find(certificateDocumentQuery);
...@@ -119,6 +129,34 @@ public class ChildLicenseServiceImpl extends AbstractCRUDServiceImpl<ChildLicens ...@@ -119,6 +129,34 @@ public class ChildLicenseServiceImpl extends AbstractCRUDServiceImpl<ChildLicens
return result; return result;
} }
@Override
protected void updateBefore(ChildLicenseEntity entity, Context context) throws AppException {
String WarterMark = GlobalSysInfo.getParamValue(Constant.Param_waterMark, "");
if (ObjectUtils.isEmpty(WarterMark)) return;
if (!ObjectUtils.isEmpty(entity.getOriginalFilePath())) {
String originalFilePath = entity.getOriginalFilePath();
String targetPath = getWaterPath(WarterMark, originalFilePath);
entity.setOriginalWaterMarkPath(targetPath);
}
if (!ObjectUtils.isEmpty(entity.getCopyFilePath())) {
String originalFilePath = entity.getCopyFilePath();
String targetPath = getWaterPath(WarterMark, originalFilePath);
entity.setCopyWaterMarkPath(targetPath);
}
super.updateBefore(entity, context);
}
private String getWaterPath(String WarterMark, String originalFilePath) {
String originalAllPath = uploadService.getFilePath(originalFilePath);
String targetPath = "/file/fileupload/" + new Date().getTime() + "_watermark.jpg";
String targetAllPath = uploadService.getFilePath(targetPath);
if (FileUtil.exist(originalAllPath)) {
WatermarkImgUtils.addWatermark(originalAllPath,
targetAllPath,
WarterMark, "jpg");
}
return targetPath;
}
} }
\ No newline at end of file
one-certificate-manager/src/main/java/com/mortals/xhx/module/child/web/ChildLicenseController.java
View file @ 4db4908b
...@@ -119,6 +119,8 @@ public class ChildLicenseController extends BaseCRUDJsonBodyMappingController<Ch ...@@ -119,6 +119,8 @@ public class ChildLicenseController extends BaseCRUDJsonBodyMappingController<Ch
childLicenseEntity.setReportUserName(this.getContext().getUser().getRealName()); childLicenseEntity.setReportUserName(this.getContext().getUser().getRealName());
childLicenseEntity.setReportTime(new Date()); childLicenseEntity.setReportTime(new Date());
childLicenseEntity.setProcessStatus(ProcessStatusEnum.已处理.getValue()); childLicenseEntity.setProcessStatus(ProcessStatusEnum.已处理.getValue());
childLicenseEntity.setFormContent("");
childLicenseEntity.setFormStyleContent("");
this.service.update(childLicenseEntity, getContext()); this.service.update(childLicenseEntity, getContext());
......
one-certificate-manager/src/main/resources/sqlmap/module/child/ChildLicenseMapper.xml
View file @ 4db4908b
...@@ -53,6 +53,8 @@ ...@@ -53,6 +53,8 @@
<result property="ext7" column="ext7" /> <result property="ext7" column="ext7" />
<result property="ext8" column="ext8" /> <result property="ext8" column="ext8" />
<result property="childStatus" column="childStatus" /> <result property="childStatus" column="childStatus" />
<result property="originalWaterMarkPath" column="originalWaterMarkPath" />
<result property="copyWaterMarkPath" column="copyWaterMarkPath" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
...@@ -202,23 +204,29 @@ ...@@ -202,23 +204,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('childStatus') or colPickMode == 1 and data.containsKey('childStatus')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('childStatus') or colPickMode == 1 and data.containsKey('childStatus')))">
a.childStatus, a.childStatus,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('originalWaterMarkPath') or colPickMode == 1 and data.containsKey('originalWaterMarkPath')))">
a.originalWaterMarkPath,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('copyWaterMarkPath') or colPickMode == 1 and data.containsKey('copyWaterMarkPath')))">
a.copyWaterMarkPath,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="ChildLicenseEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="ChildLicenseEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_child_license insert into mortals_xhx_child_license
(siteId,siteName,catalogId,catalogName,applyId,documentId,documentName,deptId,deptName,marketEntityName,licenseCode,legalPersonName,creditCode,productLicenseTime,certQRCode,certAuthority,businessPlace,licensedItems,originalFileName,originalFilePath,copyFileName,copyFilePath,summary,formStyleContent,formContent,processStatus,remark,createTime,createUserId,updateUserId,updateTime,reportUserId,reportUserName,reportTime,createUserName,updateUserName,deleted,shortName,ext1,ext2,ext3,ext4,ext5,ext6,ext7,ext8,childStatus) (siteId,siteName,catalogId,catalogName,applyId,documentId,documentName,deptId,deptName,marketEntityName,licenseCode,legalPersonName,creditCode,productLicenseTime,certQRCode,certAuthority,businessPlace,licensedItems,originalFileName,originalFilePath,copyFileName,copyFilePath,summary,formStyleContent,formContent,processStatus,remark,createTime,createUserId,updateUserId,updateTime,reportUserId,reportUserName,reportTime,createUserName,updateUserName,deleted,shortName,ext1,ext2,ext3,ext4,ext5,ext6,ext7,ext8,childStatus,originalWaterMarkPath,copyWaterMarkPath)
VALUES VALUES
(#{siteId},#{siteName},#{catalogId},#{catalogName},#{applyId},#{documentId},#{documentName},#{deptId},#{deptName},#{marketEntityName},#{licenseCode},#{legalPersonName},#{creditCode},#{productLicenseTime},#{certQRCode},#{certAuthority},#{businessPlace},#{licensedItems},#{originalFileName},#{originalFilePath},#{copyFileName},#{copyFilePath},#{summary},#{formStyleContent},#{formContent},#{processStatus},#{remark},#{createTime},#{createUserId},#{updateUserId},#{updateTime},#{reportUserId},#{reportUserName},#{reportTime},#{createUserName},#{updateUserName},#{deleted},#{shortName},#{ext1},#{ext2},#{ext3},#{ext4},#{ext5},#{ext6},#{ext7},#{ext8},#{childStatus}) (#{siteId},#{siteName},#{catalogId},#{catalogName},#{applyId},#{documentId},#{documentName},#{deptId},#{deptName},#{marketEntityName},#{licenseCode},#{legalPersonName},#{creditCode},#{productLicenseTime},#{certQRCode},#{certAuthority},#{businessPlace},#{licensedItems},#{originalFileName},#{originalFilePath},#{copyFileName},#{copyFilePath},#{summary},#{formStyleContent},#{formContent},#{processStatus},#{remark},#{createTime},#{createUserId},#{updateUserId},#{updateTime},#{reportUserId},#{reportUserName},#{reportTime},#{createUserName},#{updateUserName},#{deleted},#{shortName},#{ext1},#{ext2},#{ext3},#{ext4},#{ext5},#{ext6},#{ext7},#{ext8},#{childStatus},#{originalWaterMarkPath},#{copyWaterMarkPath})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_child_license insert into mortals_xhx_child_license
(siteId,siteName,catalogId,catalogName,applyId,documentId,documentName,deptId,deptName,marketEntityName,licenseCode,legalPersonName,creditCode,productLicenseTime,certQRCode,certAuthority,businessPlace,licensedItems,originalFileName,originalFilePath,copyFileName,copyFilePath,summary,formStyleContent,formContent,processStatus,remark,createTime,createUserId,updateUserId,updateTime,reportUserId,reportUserName,reportTime,createUserName,updateUserName,deleted,shortName,ext1,ext2,ext3,ext4,ext5,ext6,ext7,ext8,childStatus) (siteId,siteName,catalogId,catalogName,applyId,documentId,documentName,deptId,deptName,marketEntityName,licenseCode,legalPersonName,creditCode,productLicenseTime,certQRCode,certAuthority,businessPlace,licensedItems,originalFileName,originalFilePath,copyFileName,copyFilePath,summary,formStyleContent,formContent,processStatus,remark,createTime,createUserId,updateUserId,updateTime,reportUserId,reportUserName,reportTime,createUserName,updateUserName,deleted,shortName,ext1,ext2,ext3,ext4,ext5,ext6,ext7,ext8,childStatus,originalWaterMarkPath,copyWaterMarkPath)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.siteName},#{item.catalogId},#{item.catalogName},#{item.applyId},#{item.documentId},#{item.documentName},#{item.deptId},#{item.deptName},#{item.marketEntityName},#{item.licenseCode},#{item.legalPersonName},#{item.creditCode},#{item.productLicenseTime},#{item.certQRCode},#{item.certAuthority},#{item.businessPlace},#{item.licensedItems},#{item.originalFileName},#{item.originalFilePath},#{item.copyFileName},#{item.copyFilePath},#{item.summary},#{item.formStyleContent},#{item.formContent},#{item.processStatus},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateUserId},#{item.updateTime},#{item.reportUserId},#{item.reportUserName},#{item.reportTime},#{item.createUserName},#{item.updateUserName},#{item.deleted},#{item.shortName},#{item.ext1},#{item.ext2},#{item.ext3},#{item.ext4},#{item.ext5},#{item.ext6},#{item.ext7},#{item.ext8},#{item.childStatus}) (#{item.siteId},#{item.siteName},#{item.catalogId},#{item.catalogName},#{item.applyId},#{item.documentId},#{item.documentName},#{item.deptId},#{item.deptName},#{item.marketEntityName},#{item.licenseCode},#{item.legalPersonName},#{item.creditCode},#{item.productLicenseTime},#{item.certQRCode},#{item.certAuthority},#{item.businessPlace},#{item.licensedItems},#{item.originalFileName},#{item.originalFilePath},#{item.copyFileName},#{item.copyFilePath},#{item.summary},#{item.formStyleContent},#{item.formContent},#{item.processStatus},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateUserId},#{item.updateTime},#{item.reportUserId},#{item.reportUserName},#{item.reportTime},#{item.createUserName},#{item.updateUserName},#{item.deleted},#{item.shortName},#{item.ext1},#{item.ext2},#{item.ext3},#{item.ext4},#{item.ext5},#{item.ext6},#{item.ext7},#{item.ext8},#{item.childStatus},#{item.originalWaterMarkPath},#{item.copyWaterMarkPath})
</foreach> </foreach>
</insert> </insert>
...@@ -402,6 +410,12 @@ ...@@ -402,6 +410,12 @@
<if test="(colPickMode==0 and data.containsKey('childStatusIncrement')) or (colPickMode==1 and !data.containsKey('childStatusIncrement'))"> <if test="(colPickMode==0 and data.containsKey('childStatusIncrement')) or (colPickMode==1 and !data.containsKey('childStatusIncrement'))">
a.childStatus=ifnull(a.childStatus,0) + #{data.childStatusIncrement}, a.childStatus=ifnull(a.childStatus,0) + #{data.childStatusIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('originalWaterMarkPath')) or (colPickMode==1 and !data.containsKey('originalWaterMarkPath'))">
a.originalWaterMarkPath=#{data.originalWaterMarkPath},
</if>
<if test="(colPickMode==0 and data.containsKey('copyWaterMarkPath')) or (colPickMode==1 and !data.containsKey('copyWaterMarkPath'))">
a.copyWaterMarkPath=#{data.copyWaterMarkPath},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -798,6 +812,20 @@ ...@@ -798,6 +812,20 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="originalWaterMarkPath=(case" suffix="ELSE originalWaterMarkPath end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('originalWaterMarkPath')) or (colPickMode==1 and !item.containsKey('originalWaterMarkPath'))">
when a.id=#{item.id} then #{item.originalWaterMarkPath}
</if>
</foreach>
</trim>
<trim prefix="copyWaterMarkPath=(case" suffix="ELSE copyWaterMarkPath end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('copyWaterMarkPath')) or (colPickMode==1 and !item.containsKey('copyWaterMarkPath'))">
when a.id=#{item.id} then #{item.copyWaterMarkPath}
</if>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -1974,6 +2002,48 @@ ...@@ -1974,6 +2002,48 @@
${_conditionType_} a.childStatus <![CDATA[ <= ]]> #{${_conditionParam_}.childStatusEnd} ${_conditionType_} a.childStatus <![CDATA[ <= ]]> #{${_conditionParam_}.childStatusEnd}
</if> </if>
<if test="conditionParamRef.containsKey('originalWaterMarkPath')">
<if test="conditionParamRef.originalWaterMarkPath != null and conditionParamRef.originalWaterMarkPath != ''">
${_conditionType_} a.originalWaterMarkPath like #{${_conditionParam_}.originalWaterMarkPath}
</if>
<if test="conditionParamRef.originalWaterMarkPath == null">
${_conditionType_} a.originalWaterMarkPath is null
</if>
</if>
<if test="conditionParamRef.containsKey('originalWaterMarkPathList') and conditionParamRef.originalWaterMarkPathList.size() > 0">
${_conditionType_} a.originalWaterMarkPath in
<foreach collection="conditionParamRef.originalWaterMarkPathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('originalWaterMarkPathNotList') and conditionParamRef.originalWaterMarkPathNotList.size() > 0">
${_conditionType_} a.originalWaterMarkPath not in
<foreach collection="conditionParamRef.originalWaterMarkPathNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('copyWaterMarkPath')">
<if test="conditionParamRef.copyWaterMarkPath != null and conditionParamRef.copyWaterMarkPath != ''">
${_conditionType_} a.copyWaterMarkPath like #{${_conditionParam_}.copyWaterMarkPath}
</if>
<if test="conditionParamRef.copyWaterMarkPath == null">
${_conditionType_} a.copyWaterMarkPath is null
</if>
</if>
<if test="conditionParamRef.containsKey('copyWaterMarkPathList') and conditionParamRef.copyWaterMarkPathList.size() > 0">
${_conditionType_} a.copyWaterMarkPath in
<foreach collection="conditionParamRef.copyWaterMarkPathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('copyWaterMarkPathNotList') and conditionParamRef.copyWaterMarkPathNotList.size() > 0">
${_conditionType_} a.copyWaterMarkPath not in
<foreach collection="conditionParamRef.copyWaterMarkPathNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -2395,6 +2465,16 @@ ...@@ -2395,6 +2465,16 @@
<if test='orderCol.childStatus != null and "DESC".equalsIgnoreCase(orderCol.childStatus)'>DESC</if> <if test='orderCol.childStatus != null and "DESC".equalsIgnoreCase(orderCol.childStatus)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('originalWaterMarkPath')">
a.originalWaterMarkPath
<if test='orderCol.originalWaterMarkPath != null and "DESC".equalsIgnoreCase(orderCol.originalWaterMarkPath)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('copyWaterMarkPath')">
a.copyWaterMarkPath
<if test='orderCol.copyWaterMarkPath != null and "DESC".equalsIgnoreCase(orderCol.copyWaterMarkPath)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
......
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