forked from rongchao/epmet-cloud-rizhao
Browse Source
# Conflicts: # epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.javadev
sunyuchao
5 years ago
16 changed files with 251 additions and 93 deletions
@ -1,24 +0,0 @@ |
|||||
package com.epmet.dto.form; |
|
||||
|
|
||||
import lombok.Data; |
|
||||
|
|
||||
import javax.validation.constraints.NotBlank; |
|
||||
import javax.validation.constraints.NotNull; |
|
||||
import java.io.Serializable; |
|
||||
|
|
||||
/** |
|
||||
* @description: |
|
||||
* @author: liushaowen |
|
||||
* @date: 2020/11/13 10:56 |
|
||||
*/ |
|
||||
|
|
||||
@Data |
|
||||
public class UploadBytesFormDTO implements Serializable { |
|
||||
private static final long serialVersionUID = 1L; |
|
||||
|
|
||||
@NotNull(message = "字节数组不能为空") |
|
||||
private byte[] bytes; |
|
||||
|
|
||||
@NotBlank(message = "后缀不能为空") |
|
||||
private String extension; |
|
||||
} |
|
||||
@ -0,0 +1,66 @@ |
|||||
|
package com.epmet.resi.group.dto; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
import org.apache.commons.lang3.ArrayUtils; |
||||
|
import org.springframework.web.multipart.MultipartFile; |
||||
|
|
||||
|
import java.io.File; |
||||
|
import java.io.IOException; |
||||
|
import java.io.InputStream; |
||||
|
|
||||
|
/** |
||||
|
* @description: |
||||
|
* @author: liushaowen |
||||
|
* @date: 2020/11/16 13:52 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class QRCodeMultipartFileDTO implements MultipartFile { |
||||
|
|
||||
|
private String name = "file"; |
||||
|
|
||||
|
private String originalFilename; |
||||
|
|
||||
|
private String contentType = "image/jpeg"; |
||||
|
|
||||
|
private byte[] bytes; |
||||
|
|
||||
|
@Override |
||||
|
public String getName() { |
||||
|
return this.name; |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public String getOriginalFilename() { |
||||
|
return this.originalFilename; |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public String getContentType() { |
||||
|
return this.contentType; |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public boolean isEmpty() { |
||||
|
return ArrayUtils.isEmpty(bytes)?true:false; |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public long getSize() { |
||||
|
return ArrayUtils.isEmpty(bytes)?bytes.length:0; |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public byte[] getBytes() { |
||||
|
return this.bytes; |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public InputStream getInputStream() { |
||||
|
return null; |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public void transferTo(File file) { |
||||
|
|
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,33 @@ |
|||||
|
package com.epmet.resi.group.dto.group.form; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import javax.validation.constraints.NotBlank; |
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @description: 获取生成海报(小组码)信息-接口入参 |
||||
|
* @author: sun |
||||
|
*/ |
||||
|
@Data |
||||
|
public class GroupCodeBasicInfoFormDTO implements Serializable { |
||||
|
private static final long serialVersionUID = 1L; |
||||
|
/** |
||||
|
* 客户id |
||||
|
*/ |
||||
|
//@NotBlank(message = "客户id不能为空", groups = {GroupCodeBasicInfoFormDTO.GroupCodeInfo.class})
|
||||
|
private String customerId; |
||||
|
/** |
||||
|
* 网格id |
||||
|
*/ |
||||
|
//@NotBlank(message = "网格id不能为空", groups = {GroupCodeBasicInfoFormDTO.GroupCodeInfo.class})
|
||||
|
private String gridId; |
||||
|
/** |
||||
|
* 组id |
||||
|
*/ |
||||
|
@NotBlank(message = "群组id不能为空", groups = {GroupCodeBasicInfoFormDTO.GroupCodeInfo.class}) |
||||
|
private String groupId; |
||||
|
|
||||
|
public interface GroupCodeInfo {} |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,43 @@ |
|||||
|
package com.epmet.resi.group.dto.group.result; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @description: 获取生成海报(小组码)信息-接口入参 |
||||
|
* @author: sun |
||||
|
*/ |
||||
|
@Data |
||||
|
public class GroupCodeBasicInfoResultDTO implements Serializable { |
||||
|
private static final long serialVersionUID = -1590972041272087570L; |
||||
|
|
||||
|
/** |
||||
|
* 小组Id |
||||
|
*/ |
||||
|
private String groupId; |
||||
|
/** |
||||
|
* 小组名称 |
||||
|
*/ |
||||
|
private String groupName; |
||||
|
/** |
||||
|
* 小组头像 |
||||
|
*/ |
||||
|
private String groupHeadPhoto; |
||||
|
/** |
||||
|
* 小组介绍 |
||||
|
*/ |
||||
|
private String groupIntroduction; |
||||
|
/** |
||||
|
* 小组二维码路径 |
||||
|
*/ |
||||
|
private String groupCodeUrl; |
||||
|
/** |
||||
|
* 小组创建人称谓(街道-姓氏+称谓)(南宁路-李先生) |
||||
|
*/ |
||||
|
private String showName; |
||||
|
/** |
||||
|
* 小组创建人Id |
||||
|
*/ |
||||
|
private String groupUserId; |
||||
|
} |
||||
@ -1,22 +1,29 @@ |
|||||
<?xml version="1.0" encoding="UTF-8"?> |
<?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"> |
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
|
|
||||
<mapper namespace="com.epmet.resi.group.dto.group.ResiGroupCodeDTO"> |
<mapper namespace="com.epmet.modules.group.dao.ResiGroupCodeDao"> |
||||
|
|
||||
<resultMap type="com.epmet.modules.group.entity.ResiGroupCodeEntity" id="resiGroupCodeMap"> |
|
||||
<result property="id" column="ID"/> |
|
||||
<result property="customerId" column="CUSTOMER_ID"/> |
|
||||
<result property="gridId" column="GRID_ID"/> |
|
||||
<result property="groupId" column="GROUP_ID"/> |
|
||||
<result property="type" column="TYPE"/> |
|
||||
<result property="url" column="URL"/> |
|
||||
<result property="delFlag" column="DEL_FLAG"/> |
|
||||
<result property="revision" column="REVISION"/> |
|
||||
<result property="createdBy" column="CREATED_BY"/> |
|
||||
<result property="createdTime" column="CREATED_TIME"/> |
|
||||
<result property="updatedBy" column="UPDATED_BY"/> |
|
||||
<result property="updatedTime" column="UPDATED_TIME"/> |
|
||||
</resultMap> |
|
||||
|
|
||||
|
<select id="selectGroupCodeBasicInfo" resultType="com.epmet.resi.group.dto.group.result.GroupCodeBasicInfoResultDTO"> |
||||
|
SELECT |
||||
|
rgc.GROUP_ID AS "groupId", |
||||
|
rgc.URL AS "groupCodeUrl", |
||||
|
rg.GROUP_NAME AS "groupName", |
||||
|
rg.GROUP_HEAD_PHOTO AS "groupHeadPhoto", |
||||
|
rg.GROUP_INTRODUCTION AS "groupIntroduction", |
||||
|
rg.CREATED_BY AS "groupUserId" |
||||
|
FROM |
||||
|
resi_group_code rgc |
||||
|
INNER JOIN resi_group rg ON rgc.GROUP_ID = rg.ID |
||||
|
WHERE |
||||
|
rgc.DEL_FLAG = '0' |
||||
|
AND rg.DEL_FLAG = '0' |
||||
|
AND rgc.GROUP_ID = #{groupId} |
||||
|
<if test='null != customerId and "" != customerId'> |
||||
|
and rgc.customer_id = #{customerId} |
||||
|
</if> |
||||
|
<if test='null != gridId and "" != gridId'> |
||||
|
and rgc.grid_id = #{gridId} |
||||
|
</if> |
||||
|
</select> |
||||
|
|
||||
</mapper> |
</mapper> |
||||
|
|||||
Loading…
Reference in new issue