Skip to content

B
basic-api-boot
提交 3cde5491 作者: 17607474349
操作

Merge remote-tracking branch 'origin/dev_tzl' into dev_lijing 

# Conflicts:
#	app/src/main/java/com/yiring/app/web/map/MapController.java
上级 89b9a7cb dbf4647d
正在显示 包含 1500 行增加 和 75 行删除
app/src/main/java/com/yiring/app/domain/broadcast/Broadcast.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.domain.broadcast;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import lombok.*;
import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants;
import org.hibernate.annotations.Comment;
import org.hibernate.annotations.CreationTimestamp;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.UpdateTimestamp;
import org.hibernate.snowflake.SnowflakeId;
import org.locationtech.jts.geom.Point;
/**
* @author tzl
* @version 1.0
* @description:
* @date 2022/5/5 17:06
*/
@Getter
@Setter
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldNameConstants
@Comment("播报设备表")
@FieldDefaults(level = AccessLevel.PRIVATE)
@Entity
@Table(name = "BS_BROADCAST")
public class Broadcast implements Serializable {
@Serial
private static final long serialVersionUID = 2856845594409003209L;
@Comment("编号")
@Id
@GeneratedValue(generator = SnowflakeId.GENERATOR)
@GenericGenerator(name = SnowflakeId.GENERATOR, strategy = SnowflakeId.Strategy.LONG)
Long id;
@Comment("播报设备编号")
String broadcastNum;
@Comment("播报设备名称")
String broadcastName;
@Comment("坐标点信息")
Point point;
@Comment("播报设备地址")
String broadcastAdd;
@Comment("备注")
String remark;
@Comment("是否启用")
String status;
@Comment("创建时间")
@CreationTimestamp
LocalDateTime createTime;
@Comment("修改时间")
@UpdateTimestamp
LocalDateTime updateTime;
}
app/src/main/java/com/yiring/app/domain/broadcast/BroadcastRepository.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.domain.broadcast;
import java.io.Serializable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.stereotype.Repository;
/**
* @author tzl
* 2022/5/5 17:13
*/
@Repository
public interface BroadcastRepository
extends JpaRepository<Broadcast, Serializable>, JpaSpecificationExecutor<Broadcast> {}
app/src/main/java/com/yiring/app/domain/icon/Icon.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.domain.icon;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import lombok.*;
import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants;
import org.hibernate.annotations.Comment;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.snowflake.SnowflakeId;
/**
*
* @author tzl
* @version 1.0
* @description: 图标
* @date 2022/4/29 11:08
*/
@Getter
@Setter
@ToString
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldNameConstants
@FieldDefaults(level = AccessLevel.PRIVATE)
@Entity
@Table(name = "BS_ICON")
@Comment("图标")
public class Icon implements Serializable {
@Serial
private static final long serialVersionUID = 7848846860889883431L;
@Comment("编号")
@Id
@GeneratedValue(generator = SnowflakeId.GENERATOR)
@GenericGenerator(name = SnowflakeId.GENERATOR, strategy = SnowflakeId.Strategy.LONG)
Long id;
@Comment("图标名称")
String iconName;
@Comment("图标类型")
String iconType;
@Comment("图标分类")
String iconSort;
@Comment("在线图标")
String iconOnline;
@Comment("离线图标")
String iconOffline;
@Comment("创建时间")
LocalDateTime createTime;
@Comment("修改时间")
LocalDateTime updateTime;
}
app/src/main/java/com/yiring/app/domain/icon/IconRepository.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.domain.icon;
import java.io.Serializable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.stereotype.Repository;
/**
* @author tzl
* 2022/4/29 13:49
*/
@Repository
public interface IconRepository extends JpaRepository<Icon, Serializable>, JpaSpecificationExecutor<Icon> {}
app/src/main/java/com/yiring/app/domain/visitor/Invitation.java
......@@ -3,6 +3,7 @@ package com.yiring.app.domain.visitor;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.yiring.auth.domain.user.User;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
......@@ -11,6 +12,8 @@ import lombok.*;
import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants;
import org.hibernate.annotations.Comment;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.snowflake.SnowflakeId;
......@@ -31,6 +34,8 @@ import org.hibernate.snowflake.SnowflakeId;
@FieldNameConstants
@FieldDefaults(level = AccessLevel.PRIVATE)
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "BS_INVITATION")
@Comment("邀请信息")
public class Invitation implements Serializable {
......@@ -50,8 +55,8 @@ public class Invitation implements Serializable {
@Comment("状态")
String status;
@Comment("邀请人id")
Long inviterId;
// @Comment("邀请人id")
// Long inviterId;
@Comment("邀请人数")
Integer numOfVisitor;
......@@ -60,12 +65,22 @@ public class Invitation implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
LocalDateTime createTime;
@Comment("修改时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
LocalDateTime updateTime;
// @Comment("访客id")
// Long visitorId;
@Comment("被邀请访客")
@JsonIgnore
@OneToOne
@OneToOne(cascade = CascadeType.REMOVE)
@JoinColumn(name = "visitor_id", referencedColumnName = "id")
Visitor visitor;
@Comment("邀请人")
@JsonIgnore
@OneToOne
@JoinColumn(name = "inviter_id", referencedColumnName = "id")
User user;
}
app/src/main/java/com/yiring/app/domain/visitor/InvitationRepository.java
......@@ -2,6 +2,8 @@
package com.yiring.app.domain.visitor;
import java.io.Serializable;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.stereotype.Repository;
......@@ -12,4 +14,14 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public interface InvitationRepository
extends JpaRepository<Invitation, Serializable>, JpaSpecificationExecutor<Invitation> {}
extends JpaRepository<Invitation, Serializable>, JpaSpecificationExecutor<Invitation> {
/**
* 小程序用户查看邀请信息
* @author tzl
* @date 2022/4/28 11:08
* @param mobile 手机
* @param deleted 是否删除
* @return java.util.List<com.yiring.app.domain.visitor.Invitation>
*/
Page<Invitation> findAllByVisitor_VisitorMobileAndVisitor_Deleted(String mobile, String deleted, Pageable pageable);
}
app/src/main/java/com/yiring/app/domain/visitor/Visitor.java
......@@ -2,6 +2,7 @@
package com.yiring.app.domain.visitor;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yiring.auth.domain.user.User;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
......@@ -70,8 +71,8 @@ public class Visitor implements Serializable {
@Comment("所属单位id")
String orgId;
@Comment("被访人id")
String intervieweeId;
// @Comment("被访人id")
// Long intervieweeId;
@Comment("来访原因/邀请原因")
String reason;
......@@ -108,4 +109,17 @@ public class Visitor implements Serializable {
@Comment("访客车辆")
@OneToOne(cascade = { CascadeType.ALL })
Car car;
@Comment("被访人信息")
@OneToOne
@JoinColumn(name = "interviewee_id", referencedColumnName = "id")
User user;
@Comment("修改时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
LocalDateTime updateTime;
// @Comment("邀请人")
// @OneToOne(cascade = { CascadeType.ALL })
// @JoinColumn(name = "main_visitor_id", referencedColumnName = "id")
// Visitor visitor;
}
app/src/main/java/com/yiring/app/domain/visitor/VisitorRepository.java
......@@ -2,6 +2,9 @@
package com.yiring.app.domain.visitor;
import java.io.Serializable;
import java.util.List;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.stereotype.Repository;
......@@ -13,4 +16,10 @@ import org.springframework.stereotype.Repository;
@Repository
public interface VisitorRepository extends JpaRepository<Visitor, Serializable>, JpaSpecificationExecutor<Visitor> {
Visitor findByIdAndDeleted(Long id, String deleted);
List<Visitor> findAllByMainVisitorIdAndDeletedEquals(Long mainId, String deleted);
List<Visitor> findAllByMainVisitorIdAndDeletedEqualsAndIdIsNot(Long mainId, String deleted, Long id);
Page<Visitor> findAllByVisitorMobileAndDeletedEquals(String mobile, String deleted, Pageable pageable);
}
app/src/main/java/com/yiring/app/excel/broadcast/BroadcastExportExcel.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.excel.broadcast;
import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
import com.github.liaochong.myexcel.core.annotation.ExcelModel;
import java.io.Serial;
import java.io.Serializable;
import lombok.*;
import lombok.experimental.FieldDefaults;
/**
* @author tzl
* @version 1.0
* @description:
* @date 2022/5/6 9:04
*/
@ExcelModel
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
@FieldDefaults(level = AccessLevel.PRIVATE)
public class BroadcastExportExcel implements Serializable {
@Serial
private static final long serialVersionUID = 2342047029622668894L;
@ExcelColumn(title = "编号", width = 10)
String broadcastNum;
@ExcelColumn(title = "设备名称", width = 10)
String broadcastName;
@ExcelColumn(title = "经度")
double lon;
@ExcelColumn(title = "纬度")
double lat;
@ExcelColumn(title = "设备地址", width = 10)
String broadcastAdd;
@ExcelColumn(title = "备注", width = 15)
String remark;
}
app/src/main/java/com/yiring/app/excel/broadcast/BroadcastImportExcel.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.excel.broadcast;
import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
import com.github.liaochong.myexcel.core.annotation.ExcelModel;
import java.io.Serial;
import java.io.Serializable;
import lombok.*;
import lombok.experimental.FieldDefaults;
/**
* @author tzl
* 2022/5/6 09:12
*/
@ExcelModel
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
@FieldDefaults(level = AccessLevel.PRIVATE)
public class BroadcastImportExcel implements Serializable {
@Serial
private static final long serialVersionUID = 5422685189135254189L;
@ExcelColumn(title = "编号")
String broadcastNum;
@ExcelColumn(title = "设备名称")
String broadcastName;
@ExcelColumn(title = "经度")
double lon;
@ExcelColumn(title = "纬度")
double lat;
@ExcelColumn(title = "设备地址")
String broadcastAdd;
@ExcelColumn(title = "备注")
String remark;
// String status;
}
app/src/main/java/com/yiring/app/excel/video/VideoExportExcel.java
......@@ -7,7 +7,6 @@ import java.io.Serial;
import java.io.Serializable;
import lombok.*;
import lombok.experimental.FieldDefaults;
import org.locationtech.jts.geom.Point;
/**
* @author tzl
......@@ -30,8 +29,11 @@ public class VideoExportExcel implements Serializable {
@ExcelColumn(title = "摄像头名称", width = 10)
String videoName;
@ExcelColumn(title = "坐标点信息(经度,纬度)", width = 10)
Point point;
@ExcelColumn(title = "经度")
double lon;
@ExcelColumn(title = "纬度")
double lat;
@ExcelColumn(title = "m3u8 地址", width = 10)
String m3u8;
......
app/src/main/java/com/yiring/app/excel/visitor/InvitationExportExcel.java
......@@ -29,7 +29,7 @@ public class InvitationExportExcel implements Serializable {
@ExcelColumn(title = "邀请原因")
String reason;
@ExcelColumn(title = "邀请方式")
@ExcelColumn(title = "邀请方式", mapping = "1:个人,2:公司")
String InvitationMethod;
@ExcelColumn(title = "邀请人数")
......@@ -44,7 +44,7 @@ public class InvitationExportExcel implements Serializable {
@ExcelColumn(title = "到访人电话")
String visitorMobile;
@ExcelColumn(title = "是否特殊任务")
@ExcelColumn(title = "是否特殊任务", mapping = "false:否,true:是")
String taskType;
// Long inviterId;
......
app/src/main/java/com/yiring/app/feign/WxClient.java
......@@ -2,11 +2,10 @@
package com.yiring.app.feign;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
@FeignClient(url = "api.weixin.qq.com", name = "wxclient")
public interface WxClient {
......@@ -22,13 +21,10 @@ public interface WxClient {
* @date 15:20
*/
@RequestMapping(value = "/sns/jscode2session", method = RequestMethod.GET)
@ApiImplicitParams(
{
@ApiImplicitParam(value = "appid", required = true, name = "appid"),
@ApiImplicitParam(value = "secret", required = true, name = "secret"),
@ApiImplicitParam(value = "js_code", required = true, name = "js_code"),
@ApiImplicitParam(value = "grant_type", required = true, name = "grant_type"),
}
)
JSONObject getOpenid(String appid, String secret, String js_code, String grant_type);
JSONObject getOpenid(
@RequestParam("appid") String appid,
@RequestParam("secret") String secret,
@RequestParam("js_code") String js_code,
@RequestParam("grant_type") String grant_type
);
}
app/src/main/java/com/yiring/app/param/appUser/AppletUserParam.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.param.appUser;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import javax.validation.constraints.NotEmpty;
import lombok.*;
import lombok.experimental.FieldDefaults;
/**
* @author tzl
* @version 1.0
* @description:
* @date 2022/4/28 13:40
*/
@ApiModel("AppletUserParam")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public class AppletUserParam implements Serializable {
@Serial
private static final long serialVersionUID = 1684195733142347657L;
@ApiModelProperty(value = "手机号", example = "17674741309", required = true)
@NotEmpty(message = "手机号不能为空")
String mobile;
@ApiModelProperty(value = "微信唯一标识", example = "17674741309", required = true)
@NotEmpty(message = "微信唯一标识不能为空")
String openid;
}
app/src/main/java/com/yiring/app/param/appUser/AppletUserQueryParam.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.param.appUser;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import lombok.*;
import lombok.experimental.FieldDefaults;
/**
* @author tzl
* @version 1.0
* @description:
* @date 2022/4/28 13:52
*/
@ApiModel("AppletUserQueryParam")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public class AppletUserQueryParam implements Serializable {
@Serial
private static final long serialVersionUID = 1806727740548075365L;
@ApiModelProperty(value = "小程序 appId", example = "1", required = true)
String appid;
@ApiModelProperty(value = "小程序 appSecret", example = "1", required = true)
String secret;
@ApiModelProperty(value = "登录时获取的 code", example = "1", required = true)
String js_code;
@ApiModelProperty(value = "授权类型，此处只需填写 authorization_code", example = "1", required = true)
String grant_type;
}
app/src/main/java/com/yiring/app/param/broadcast/BroadcastParam.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.param.broadcast;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import lombok.*;
import lombok.experimental.FieldDefaults;
/**
* 播报设备入参
* @author tzl
* @version 1.0
* @description:
* @date 2022/5/5 17:14
*/
@ApiModel("BroadcastParam")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public class BroadcastParam implements Serializable {
@Serial
private static final long serialVersionUID = -2629601722942495674L;
@ApiModelProperty(value = "编号", example = "1", required = true)
@NotNull(message = "编号")
String broadcastNum;
@ApiModelProperty(value = "经度", example = "1.00", required = true)
@NotNull(message = "经度")
Double lon;
@ApiModelProperty(value = "纬度", example = "1.00", required = true)
@NotNull(message = "纬度")
Double lat;
@ApiModelProperty(value = "备注", example = "厂区喇叭")
@Size(max = 100, message = "备注不能超过100字")
String remark;
@ApiModelProperty(value = "播报设备地址", example = "音柱地址", required = true)
@NotEmpty(message = "播报设备地址不能为空")
String broadcastAdd;
@ApiModelProperty(value = "播报设备地址名称", example = "喇叭1", required = true)
@NotEmpty(message = "播报设备地址名称不能为空")
String broadcastName;
}
app/src/main/java/com/yiring/app/param/broadcast/BroadcastQueryParam.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.param.broadcast;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import lombok.*;
import lombok.experimental.FieldDefaults;
/**
* @author tzl
* @version 1.0
* @description:
* @date 2022/5/5 17:22
*/
@ApiModel("BroadcastQueryParam")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public class BroadcastQueryParam implements Serializable {
@Serial
private static final long serialVersionUID = -7181714985511069309L;
@ApiModelProperty(value = "编号", example = "1")
String broadcastNum;
@ApiModelProperty(value = "播报设备地址名称", example = "喇叭1")
String broadcastName;
@ApiModelProperty(value = "状态", example = "1")
String status;
@ApiModelProperty(value = "分页条数", example = "10", required = true)
Integer pageSize;
@ApiModelProperty(value = "当前页数", example = "1", required = true)
Integer pageNo;
}
app/src/main/java/com/yiring/app/param/icon/IconParam.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.param.icon;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import javax.validation.constraints.NotEmpty;
import lombok.*;
import lombok.experimental.FieldDefaults;
/**
* @author tzl
* @version 1.0
* @description:
* @date 2022/5/5 9:30
*/
@ApiModel("IconParam")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public class IconParam implements Serializable {
@Serial
private static final long serialVersionUID = 666028441935810972L;
@ApiModelProperty(value = "图标名称", example = "访客头像", required = true)
@NotEmpty(message = "图标名称不能为空")
String iconName;
@ApiModelProperty(value = "图标类型", example = "1", required = true)
@NotEmpty(message = "图标类型不能为空")
String iconType;
@ApiModelProperty(value = "图标分类", example = "1", required = true)
@NotEmpty(message = "图标类型不能为空")
String iconSort;
@ApiModelProperty(value = "在线图标地址", required = true)
String iconOnline;
@ApiModelProperty(value = "离线图标地址", required = true)
String iconOffline;
}
app/src/main/java/com/yiring/app/param/visitor/InvitationAppQueryParam.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.param.visitor;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import javax.validation.constraints.NotEmpty;
import lombok.*;
import lombok.experimental.FieldDefaults;
/**
* @author tzl
* @version 1.0
* @description: TODO
* @date 2022/4/28 11:12
*/
@ApiModel("InvitationAppQueryParam")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public class InvitationAppQueryParam implements Serializable {
@Serial
private static final long serialVersionUID = 5194434249966317387L;
@ApiModelProperty(value = "到访人电话", example = "17688888888", required = true)
@NotEmpty(message = "到访人电话不能为空")
String visitorMobile;
@ApiModelProperty(value = "分页条数", example = "10")
Integer pageSize;
@ApiModelProperty(value = "当前页数", example = "1")
Integer pageNo;
}
app/src/main/java/com/yiring/app/param/visitor/InvitationParam.java
......@@ -53,7 +53,7 @@ public class InvitationParam implements Serializable {
@ApiModelProperty(value = "到访人身份证", example = "430441190001255417")
String visitorCarNum;
@ApiModelProperty(value = "是否特殊作业", example = "否", required = true)
@ApiModelProperty(value = "是否特殊作业", example = "false", required = true)
String taskType;
// @ApiModelProperty(value = "访客来源", example = "外部邀请", required = true)
......
app/src/main/java/com/yiring/app/param/visitor/InvitationQueryParam.java
......@@ -38,11 +38,11 @@ public class InvitationQueryParam implements Serializable {
@ApiModelProperty(value = "是否特殊作业", example = "fasle")
String taskType;
@ApiModelProperty(value = "邀请人id", example = "1")
Long inviterId;
@ApiModelProperty(value = "邀请人", example = "张三")
String realName;
// @ApiModelProperty(value = "邀请人部门id", example = "1")
// Long deptId;
@ApiModelProperty(value = "邀请人部门", example = "研发")
String deptName;
@ApiModelProperty(value = "预约到访时间(开始)", example = "2022-04-19 14:28:00")
LocalDateTime appOfVisitTimeStart;
......
app/src/main/java/com/yiring/app/param/visitor/VisitorAppQueryParam.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.param.visitor;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import javax.validation.constraints.NotEmpty;
import lombok.*;
import lombok.experimental.FieldDefaults;
/**
* @author tzl
* 2022/4/19 14:15
*/
@ApiModel("VisitorQueryParam")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public class VisitorAppQueryParam implements Serializable {
@Serial
private static final long serialVersionUID = 1158888191240628613L;
@ApiModelProperty(value = "到访人电话", example = "17688888888", required = true)
@NotEmpty(message = "到访人电话不能为空")
String visitorMobile;
@ApiModelProperty(value = "分页条数", example = "10")
Integer pageSize;
@ApiModelProperty(value = "当前页数", example = "1")
Integer pageNo;
}
app/src/main/java/com/yiring/app/param/visitor/VisitorParam.java
......@@ -33,6 +33,7 @@ public class VisitorParam implements Serializable {
String visitorName;
@ApiModelProperty(value = "到访人电话", example = "17688888888", required = true)
@Pattern(regexp = RegEx.MOBILE, message = "手机号码格式不正确")
@NotEmpty(message = "到访人电话不能为空")
String visitorMobile;
......
app/src/main/java/com/yiring/app/param/visitor/VisitorQueryParam.java
......@@ -3,6 +3,7 @@ package com.yiring.app.param.visitor;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.*;
......@@ -20,6 +21,7 @@ import lombok.experimental.FieldDefaults;
@FieldDefaults(level = AccessLevel.PRIVATE)
public class VisitorQueryParam implements Serializable {
@Serial
private static final long serialVersionUID = -4314254785949101573L;
@ApiModelProperty(value = "访客姓名", example = "张三")
......@@ -46,8 +48,8 @@ public class VisitorQueryParam implements Serializable {
@ApiModelProperty(value = "标签卡", example = "DS41234231")
String labelCard;
@ApiModelProperty(value = "标签卡状态", example = "1")
String labelCardStatus;
@ApiModelProperty(value = "是否主访人", example = "1:是,2否")
String isMain;
@ApiModelProperty(value = "预约到访时间(开始)", example = "2022-04-19 14:28:00")
LocalDateTime appOfVisitTimeStart;
......
app/src/main/java/com/yiring/app/service/appletUser/AppletUserService.java
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.service.appletUser;
import com.yiring.app.param.appUser.AppletUserParam;
import com.yiring.app.param.appUser.AppletUserQueryParam;
import com.yiring.common.core.Result;
/**
......@@ -13,12 +15,18 @@ public interface AppletUserService {
/**
* 根据用户唯一标识获取手机号码，通过手机号码查询用户来访信息分页
* @author tzl
* @date 2022/4/24 9:34
* @param appid String
* @param secret String
* @param js_code String
* @param grant_type String
* @date 2022/4/28 13:58
* @param appletUserQueryParam
* @return com.yiring.common.core.Result<java.lang.String>
*/
Result<String> selectMobile(String appid, String secret, String js_code, String grant_type);
Result<String> selectMobile(AppletUserQueryParam appletUserQueryParam);
/**
* 小程序注册
* @author tzl
* @date 2022/4/28 13:43
* @param appletUserParam 入参
* @return com.yiring.common.core.Result<java.lang.String>
*/
Result<String> saveAppUser(AppletUserParam appletUserParam);
}
app/src/main/java/com/yiring/app/service/appletUser/impl/AppletUserServiceImpl.java
......@@ -6,10 +6,17 @@ import com.alibaba.fastjson.JSONObject;
import com.yiring.app.domain.appletUser.AppletUser;
import com.yiring.app.domain.appletUser.AppletUserRepository;
import com.yiring.app.feign.WxClient;
import com.yiring.app.param.appUser.AppletUserParam;
import com.yiring.app.param.appUser.AppletUserQueryParam;
import com.yiring.app.service.appletUser.AppletUserService;
import com.yiring.common.core.Result;
import com.yiring.common.core.Status;
import java.util.Optional;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
* @author Administrator
......@@ -17,6 +24,9 @@ import javax.annotation.Resource;
* @description: TODO
* @date 2022/4/24 9:25
*/
@Transactional(rollbackFor = RuntimeException.class)
@Service
@Slf4j
public class AppletUserServiceImpl implements AppletUserService {
@Resource
......@@ -26,18 +36,35 @@ public class AppletUserServiceImpl implements AppletUserService {
WxClient wxClient;
@Override
public Result<String> selectMobile(String appid, String secret, String js_code, String grant_type) {
JSONObject jsonObject = wxClient.getOpenid(appid, secret, js_code, grant_type);
public Result<String> selectMobile(AppletUserQueryParam appletUserQueryParam) {
JSONObject jsonObject = wxClient.getOpenid(
appletUserQueryParam.getAppid(),
appletUserQueryParam.getSecret(),
appletUserQueryParam.getJs_code(),
appletUserQueryParam.getGrant_type()
);
Object openid = jsonObject.get("openid");
if (StrUtil.isNotBlank(openid.toString())) {
Optional<AppletUser> optional = appletUserRepository.findById(openid.toString());
//如果该微信为第一次登录小程序
if (optional.isEmpty()) {
return Result.ok("绑定手机号码");
return Result.no(Status.NOT_FOUND);
}
AppletUser appletUser = optional.get();
return Result.ok(appletUser.getMobile());
}
return null;
}
@Override
public Result<String> saveAppUser(AppletUserParam appletUserParam) {
Integer integer = appletUserRepository.countMobile(appletUserParam.getMobile());
if (integer > 0) {
return Result.no(Status.BAD_REQUEST, "手机号已绑定");
}
AppletUser appletUser = new AppletUser();
BeanUtils.copyProperties(appletUserParam, appletUser);
appletUserRepository.saveAndFlush(appletUser);
return Result.ok(appletUser.getMobile());
}
}
app/src/main/java/com/yiring/app/service/broadcast/BroadcastService.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.service.broadcast;
import com.yiring.app.param.broadcast.BroadcastParam;
import com.yiring.app.param.broadcast.BroadcastQueryParam;
import com.yiring.app.vo.broadcast.BroadcastVo;
import com.yiring.app.vo.broadcast.BroadcastjcVo;
import com.yiring.common.core.Result;
import com.yiring.common.param.IdParam;
import com.yiring.common.param.IndexParam;
import com.yiring.common.vo.PageVo;
import javax.servlet.http.HttpServletResponse;
import org.locationtech.jts.geom.Point;
import org.springframework.web.multipart.MultipartFile;
/**
* @author tzl
* @version 1.0
* @description:
* @date 2022/5/5 17:31
*/
public interface BroadcastService {
/**
* 新增播报设备
* @author tzl
* @date 2022/5/5 17:33
* @param broadcastParam BroadcastParam
* @return com.yiring.common.core.Result<java.lang.String>
*/
Result<String> saveBroadcast(BroadcastParam broadcastParam);
/**
* 修改播报设备
* @author tzl
* @date 2022/5/5 17:34
* @param broadcastParam BroadcastParam
* @param idParam IdParam
* @return com.yiring.common.core.Result<java.lang.String>
*/
Result<String> updateBroadcast(BroadcastParam broadcastParam, IdParam idParam);
/**
* 删除播报设备
* @author tzl
* @date 2022/5/5 17:35
* @param idParam IdParam
* @return com.yiring.common.core.Result<java.lang.String>
*/
Result<String> deleteBroadcast(IdParam idParam);
/**
* 查看设备位置
* @author tzl
* @date 2022/5/5 17:47
* @param idParam IdParam
* @return com.yiring.common.core.Result<org.locationtech.jts.geom.Point>
*/
Result<Point> selectPoint(IdParam idParam);
/**
* 分页查询设备
* @author tzl
* @date 2022/5/5 17:49
* @param broadcastQueryParam BroadcastQueryParam
* @return com.yiring.common.core.Result<com.yiring.app.vo.broadcast.BroadcastVo>
*/
Result<PageVo<BroadcastVo>> pageBroadcast(BroadcastQueryParam broadcastQueryParam);
/**
* 导出播报设备
* @author tzl
* @date 2022/5/6 8:56
* @param broadcastQueryParam BroadcastQueryParam
* @param response HttpServletResponse
*/
void exportBroadcast(BroadcastQueryParam broadcastQueryParam, HttpServletResponse response);
/**
* 播报设备导入
* @author tzl
* @date 2022/5/6 10:00
* @param file 文件
* @return com.yiring.common.core.Result<java.lang.String>
*/
Result<String> importBroadcast(MultipartFile file);
/**
* 根据名字检索
* @author tzl
* @date 2022/5/6 10:26
* @param indexParam 入参
* @return com.yiring.common.core.Result<com.yiring.common.vo.PageVo<com.yiring.app.vo.broadcast.BroadcastVo>>
*/
Result<PageVo<BroadcastjcVo>> selectBroadcastName(IndexParam indexParam);
}
app/src/main/java/com/yiring/app/service/icon/IconService.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.service.icon;
import com.yiring.app.param.icon.IconParam;
import com.yiring.app.vo.icon.IconVo;
import com.yiring.common.core.Result;
import com.yiring.common.param.IdParam;
import com.yiring.common.param.PageParam;
import com.yiring.common.vo.PageVo;
/**
* @author tzl
* @date 2022/5/5 9:28
*/
public interface IconService {
/**
* 图标新增接口
* @author tzl
* @date 2022/5/5 10:03
* @param iconParam IconParam
* @return com.yiring.common.core.Result<java.lang.String>
*/
Result<String> saveIcon(IconParam iconParam);
/**
* 图标删除接口
* @author tzl
* @date 2022/5/5 10:23
* @param idParam IdParam
* @return com.yiring.common.core.Result<java.lang.String>
*/
Result<String> deleteIcon(IdParam idParam);
/**
* 图标修改接口
* @author tzl
* @date 2022/5/5 10:26
* @param iconParam IconParam
* @param idParam IdParam
* @return com.yiring.common.core.Result<java.lang.String>
*/
Result<String> updateIcon(IconParam iconParam, IdParam idParam);
/**
* 分页查询
* @author tzl
* @date 2022/5/5 15:09
* @param pageParam PageParam
* @return com.yiring.common.core.Result<java.lang.String>
*/
Result<PageVo<IconVo>> pageIcon(PageParam pageParam);
}
app/src/main/java/com/yiring/app/service/icon/impl/IconServiceImpl.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.service.icon.impl;
import com.yiring.app.domain.icon.Icon;
import com.yiring.app.domain.icon.IconRepository;
import com.yiring.app.param.icon.IconParam;
import com.yiring.app.service.icon.IconService;
import com.yiring.app.vo.icon.IconVo;
import com.yiring.common.core.Result;
import com.yiring.common.core.Status;
import com.yiring.common.param.IdParam;
import com.yiring.common.param.PageParam;
import com.yiring.common.vo.PageVo;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.beans.BeanUtils;
import org.springframework.data.domain.*;
import org.springframework.stereotype.Service;
/**
* @author tzl
* @version 1.0
* @description:
* @date 2022/5/5 9:28
*/
@Service
public class IconServiceImpl implements IconService {
@Resource
IconRepository iconRepository;
@Override
public Result<String> saveIcon(IconParam iconParam) {
if (hasIconName(iconParam.getIconName())) {
return Result.no(Status.BAD_REQUEST, "图标名称已存在");
}
Icon icon = new Icon();
BeanUtils.copyProperties(iconParam, icon);
iconRepository.saveAndFlush(icon);
return Result.ok();
}
@Override
public Result<String> deleteIcon(IdParam idParam) {
Optional<Icon> optional = iconRepository.findById(idParam.getId());
if (optional.isEmpty()) {
return Result.no(Status.NOT_FOUND);
}
Icon icon = optional.get();
iconRepository.delete(icon);
return Result.ok();
}
@Override
public Result<String> updateIcon(IconParam iconParam, IdParam idParam) {
Optional<Icon> optional = iconRepository.findById(idParam.getId());
if (optional.isEmpty()) {
return Result.no(Status.NOT_FOUND);
}
Icon icon = optional.get();
//当修改图标名称时
if (!icon.getIconName().equals(iconParam.getIconName())) {
if (hasIconName(iconParam.getIconName())) {
return Result.no(Status.BAD_REQUEST, "图标名称已存在");
}
}
BeanUtils.copyProperties(iconParam, icon);
iconRepository.saveAndFlush(icon);
return Result.ok();
}
@Override
public Result<PageVo<IconVo>> pageIcon(PageParam pageParam) {
//分页
Pageable pageable = PageRequest.of(pageParam.getPageNo() - 1, pageParam.getPageSize());
Page<Icon> all = iconRepository.findAll(pageable);
List<IconVo> data = all
.get()
.map(icon -> {
IconVo vo = new IconVo();
BeanUtils.copyProperties(icon, vo);
return vo;
})
.collect(Collectors.toList());
PageVo<IconVo> resultVo = PageVo.build(data, all.getTotalElements());
return Result.ok(resultVo);
}
public boolean hasIconName(String param) {
Icon icon = Icon.builder().iconName(param).build();
long count = iconRepository.count(Example.of(icon));
return count > 0;
}
}
app/src/main/java/com/yiring/app/service/video/impl/VideoServiceImpl.java
......@@ -258,6 +258,8 @@ public class VideoServiceImpl implements VideoService {
.map(video -> {
VideoExportExcel videoExportExcel = new VideoExportExcel();
BeanUtils.copyProperties(video, videoExportExcel);
videoExportExcel.setLon(video.getPoint().getX());
videoExportExcel.setLat(video.getPoint().getY());
return videoExportExcel;
})
.collect(Collectors.toList());
......
app/src/main/java/com/yiring/app/service/visitor/InvitationService.java
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.service.visitor;
import com.yiring.app.param.visitor.InvitationAppQueryParam;
import com.yiring.app.param.visitor.InvitationParam;
import com.yiring.app.param.visitor.InvitationQueryParam;
import com.yiring.app.vo.visitor.InvitationVo;
import com.yiring.app.vo.visitor.InvitationDetailsVo;
import com.yiring.common.core.Result;
import com.yiring.common.param.IdParam;
import com.yiring.common.vo.PageVo;
......@@ -38,7 +39,7 @@ public interface InvitationService {
* @date 2022/4/24 17:56
* @return com.yiring.common.core.Result<com.yiring.common.vo.PageVo<java.lang.String>>
*/
Result<PageVo<InvitationVo>> pageInv(InvitationQueryParam invitationQueryParam);
Result<PageVo<InvitationDetailsVo>> pageInv(InvitationQueryParam invitationQueryParam);
/**
* 撤回邀请
......@@ -65,4 +66,24 @@ public interface InvitationService {
* @param invitationQueryParam 筛选条件
*/
void exportInv(InvitationQueryParam invitationQueryParam, HttpServletResponse response);
/**
* 小程序查询全部
* @author tzl
* @date 2022/4/28 10:56
* @param idParam 主键id
* @return com.yiring.common.core.Result<com.yiring.app.vo.visitor.InvitationDetailsVo>
*/
Result<InvitationDetailsVo> detailsInv(IdParam idParam);
/**
* 小程序用户查看邀请信息
* @author tzl
* @date 2022/4/28 11:30
* @param invitationAppQueryParam 入参
* @return com.yiring.common.core.Result<com.yiring.common.vo.PageVo<com.yiring.app.vo.visitor.InvitationVo>>
*/
Result<PageVo<InvitationDetailsVo>> findAllByVisitor_VisitorMobileAndVisitor_Deleted(
InvitationAppQueryParam invitationAppQueryParam
);
}
app/src/main/java/com/yiring/app/service/visitor/VisitorService.java
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.service.visitor;
import com.yiring.app.param.visitor.VisitorAppQueryParam;
import com.yiring.app.param.visitor.VisitorParam;
import com.yiring.app.param.visitor.VisitorQueryParam;
import com.yiring.app.vo.visitor.VisitorAppVo;
import com.yiring.app.vo.visitor.VisitorDetailsVo;
import com.yiring.app.vo.visitor.VisitorVo;
import com.yiring.common.core.Result;
import com.yiring.common.param.IdParam;
......@@ -15,7 +18,7 @@ import javax.servlet.http.HttpServletResponse;
*/
public interface VisitorService {
/**
* 访客新增
* 访客登记
* @param visitorParam 新增访客入参
* @return 是否成功
*/
......@@ -41,7 +44,7 @@ public interface VisitorService {
* @param idParam 主键id
* @return 访客信息
*/
Result<VisitorVo> selectVisitor(IdParam idParam);
Result<VisitorDetailsVo> selectVisitor(IdParam idParam);
/**
* 分页查询
......@@ -73,11 +76,11 @@ public interface VisitorService {
Result<String> cardRec(IdParam idParam);
/**
* 查看详情,并且带出该访客的随访人信息
* 小程序查看来访记录
* @author tzl
* @date 2022/4/25 16:48
* @param idParam 主键id
* @date 2022/4/29 15:03
* @param visitorAppQueryParam 入参
* @return com.yiring.common.core.Result<com.yiring.app.vo.visitor.VisitorVo>
*/
Result<VisitorVo> selectInfo(IdParam idParam);
Result<PageVo<VisitorAppVo>> selectInfo(VisitorAppQueryParam visitorAppQueryParam);
}
app/src/main/java/com/yiring/app/vo/broadcast/BroadcastVo.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.vo.broadcast;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import lombok.*;
import lombok.experimental.FieldDefaults;
import org.locationtech.jts.geom.Point;
/**
* @author tzl
* @version 1.0
* @description:
* @date 2022/5/5 17:26
*/
@ApiModel("BroadcastVo")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public class BroadcastVo implements Serializable {
@Serial
private static final long serialVersionUID = 2927556677143859520L;
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "id", example = "1")
Long id;
@ApiModelProperty(value = "编号", example = "1")
String broadcastNum;
@ApiModelProperty(value = "坐标点信息")
Point point;
@ApiModelProperty(value = "备注", example = "厂区喇叭")
String remark;
@ApiModelProperty(value = "音柱地址", example = "音柱地址")
String broadcastAdd;
@ApiModelProperty(value = "播报设备名称", example = "喇叭1")
String broadcastName;
}
app/src/main/java/com/yiring/app/vo/broadcast/BroadcastjcVo.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.vo.broadcast;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import lombok.*;
import lombok.experimental.FieldDefaults;
/**
* @author tzl
* @version 1.0
* @description:
* @date 2022/5/6 11:33
*/
@ApiModel("BroadcastjcVo")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public class BroadcastjcVo implements Serializable {
@Serial
private static final long serialVersionUID = 5301756979737544186L;
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "id", example = "1")
Long id;
@ApiModelProperty(value = "播报设备名称", example = "喇叭1")
String broadcastName;
}
app/src/main/java/com/yiring/app/vo/icon/IconVo.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.vo.icon;
import java.io.Serial;
import java.io.Serializable;
/**
* @author tzl
* @version 1.0
* @description:
* @date 2022/5/5 15:10
*/
public class IconVo implements Serializable {
@Serial
private static final long serialVersionUID = 2334297671118394950L;
}
app/src/main/java/com/yiring/app/vo/visitor/InvitationDetailsVo.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.vo.visitor;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.yiring.app.domain.visitor.Visitor;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import lombok.*;
import lombok.experimental.FieldDefaults;
/**
* 邀请反参
* @author tzl
* @version 1.0
* @description:
* @date 2022/4/28 10:48
*/
@ApiModel("InvitationDetailsVo")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public class InvitationDetailsVo implements Serializable {
@Serial
private static final long serialVersionUID = 5496232471863298479L;
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "id", example = "1548548545755")
Long id;
@ApiModelProperty(value = "邀请原因/来访原因", example = "随便看看")
String reason;
@ApiModelProperty(value = "邀请方式:个人 公司", example = "个人")
String InvitationMethod;
@ApiModelProperty(value = "邀请人数", example = "1")
Integer numOfVisitor;
@ApiModelProperty(value = "邀请人id", example = "1")
Long inviterId;
@ApiModelProperty(value = "状态", example = "撤回")
String status;
@ApiModelProperty(value = "被邀请访客")
Visitor visitor;
@ApiModelProperty(value = "邀请人信息")
User user;
@ApiModel("User")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public static class User implements Serializable {
@Serial
private static final long serialVersionUID = 4115779013003587949L;
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "id", example = "1")
Long id;
@ApiModelProperty(value = "邀请人姓名", example = "张三")
String realName;
@ApiModelProperty(value = "邀请人部门", example = "研发部")
String deptName;
@ApiModelProperty(value = "邀请人电话", example = "17688888888")
String mobile;
}
}
app/src/main/java/com/yiring/app/vo/visitor/InvitationVo.java
......@@ -56,4 +56,28 @@ public class InvitationVo implements Serializable {
@ApiModelProperty(value = "被邀请访客")
Visitor visitor;
@ApiModelProperty(value = "邀请人信息")
User user;
@ApiModel("User")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public static class User implements Serializable {
@Serial
private static final long serialVersionUID = 4115779013003587949L;
// @JsonSerialize(using = ToStringSerializer.class)
// @ApiModelProperty(value = "id", example = "1")
// Long id;
@ApiModelProperty(value = "邀请人姓名", example = "张三")
String realName;
@ApiModelProperty(value = "邀请人部门", example = "研发部")
String deptName;
}
}
app/src/main/java/com/yiring/app/vo/visitor/VisitorAppVo.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.vo.visitor;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.*;
import lombok.experimental.FieldDefaults;
/**
* @author tzl
* 2022/4/19 14:16
*/
@ApiModel("VisitorVo")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public class VisitorAppVo implements Serializable {
@Serial
private static final long serialVersionUID = 9004209982164273860L;
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "id", example = "1548548545755")
Long id;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "发卡时间", example = "2022-04-19 14:28:00")
LocalDateTime cardSendTime;
UserVo userVo;
@ApiModel("UserVo")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public static class UserVo implements Serializable {
@Serial
private static final long serialVersionUID = 4115779013003587949L;
@ApiModelProperty(value = "被访人姓名", example = "张三")
String realName;
@ApiModelProperty(value = "被访人姓名", example = "张三")
String mobile;
}
}
app/src/main/java/com/yiring/app/vo/visitor/VisitorDetailsVo.java
......@@ -62,8 +62,8 @@ public class VisitorDetailsVo implements Serializable {
@ApiModelProperty(value = "所属单位id", example = "壹润科技")
String orgId;
@ApiModelProperty(value = "被访人id", example = "1")
Long intervieweeId;
// @ApiModelProperty(value = "被访人id", example = "1")
// Long intervieweeId;
@ApiModelProperty(value = "被访人姓名", example = "李四")
String intervieweeName;
......@@ -90,12 +90,14 @@ public class VisitorDetailsVo implements Serializable {
@ApiModelProperty(value = "车辆反参")
Car car;
UserVo userVo;
@ApiModelProperty(value = "主访人id")
Long mainVisitorId;
List<VisitorResultVo> list;
@ApiModel("MapVoReuslt")
@ApiModel("VisitorResultVo")
@Data
@Builder
@NoArgsConstructor
......@@ -119,4 +121,29 @@ public class VisitorDetailsVo implements Serializable {
@ApiModelProperty(value = "主访人id")
Long mainVisitorId;
}
@ApiModel("UserVo")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public static class UserVo implements Serializable {
@Serial
private static final long serialVersionUID = 4115779013003587949L;
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "id", example = "1")
Long id;
@ApiModelProperty(value = "被访人姓名", example = "张三")
String realName;
@ApiModelProperty(value = "被访人电话", example = "17688888888")
String mobile;
@ApiModelProperty(value = "被访人部门")
String deptName;
}
}
app/src/main/java/com/yiring/app/vo/visitor/VisitorVo.java
......@@ -4,7 +4,6 @@ package com.yiring.app.vo.visitor;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.yiring.app.domain.visitor.Car;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
......@@ -41,11 +40,11 @@ public class VisitorVo implements Serializable {
@ApiModelProperty(value = "到访人身份证", example = "430441190001255417")
String visitorCarNum;
@ApiModelProperty(value = "是否特殊作业", example = "true")
boolean taskType;
@ApiModelProperty(value = "是否特殊作业", example = "false")
String taskType;
@ApiModelProperty(value = "邀请人数", example = "1")
Integer numOfVisitor;
// @ApiModelProperty(value = "邀请人数", example = "1")
// Integer numOfVisitor;
@ApiModelProperty(value = "访客来源", example = "内部邀请")
String visitorSource;
......@@ -53,14 +52,14 @@ public class VisitorVo implements Serializable {
@ApiModelProperty(value = "标签卡", example = "WE34421231")
String labelCard;
@ApiModelProperty(value = "标签卡状态", example = "使用中")
String labelCardStatus;
// @ApiModelProperty(value = "标签卡状态", example = "使用中")
// String labelCardStatus;
@ApiModelProperty(value = "所属单位id", example = "壹润科技")
String orgId;
@ApiModelProperty(value = "被访人id", example = "1")
String intervieweeId;
@ApiModelProperty(value = "被访人姓名", example = "李四")
String intervieweeName;
@ApiModelProperty(value = "来访原因", example = "来访原因")
String reason;
......@@ -69,18 +68,38 @@ public class VisitorVo implements Serializable {
@ApiModelProperty(value = "收卡时间", example = "2022-04-19 14:28:00")
LocalDateTime cardRecTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "预约到访时间", example = "2022-04-19 14:28:00")
LocalDateTime appOfVisitTime;
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
// @ApiModelProperty(value = "预约到访时间", example = "2022-04-19 14:28:00")
// LocalDateTime appOfVisitTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间", example = "2022-04-19 14:28:00")
LocalDateTime createTime;
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
// @ApiModelProperty(value = "创建时间", example = "2022-04-19 14:28:00")
// LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "发卡时间", example = "2022-04-19 14:28:00")
LocalDateTime cardSendTime;
@ApiModelProperty(value = "车辆反参")
Car car;
// @ApiModelProperty(value = "车辆反参")
// Car car;
@ApiModelProperty(value = "主访人id")
Long mainVisitorId;
UserVo userVo;
@ApiModel("UserVo")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public static class UserVo implements Serializable {
@Serial
private static final long serialVersionUID = 4115779013003587949L;
@ApiModelProperty(value = "被访人姓名", example = "张三")
String realName;
}
}
app/src/main/java/com/yiring/app/web/appUser/AppletUserController.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.web.appUser;
import com.yiring.app.param.appUser.AppletUserParam;
import com.yiring.app.param.appUser.AppletUserQueryParam;
import com.yiring.app.service.appletUser.AppletUserService;
import com.yiring.common.core.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;
import javax.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author tzl
* @version 1.0
* @description:
* @date 2022/4/28 13:48
*/
@Slf4j
@Validated
@Api(tags = "小程序用户")
@RestController
@RequestMapping("/appUser/")
public class AppletUserController {
@Resource
AppletUserService appletUserService;
@ApiOperation("微信绑定手机号码")
@PostMapping("saveAppUser")
public Result<String> saveAppUser(@Valid AppletUserParam appletUserParam) {
return appletUserService.saveAppUser(appletUserParam);
}
@ApiOperation("根据code获取微信用户唯一标识,返回其绑定的手机号码")
@GetMapping("selectMobile")
public Result<String> selectMobile(@Valid AppletUserQueryParam appletUserQueryParam) {
return appletUserService.selectMobile(appletUserQueryParam);
}
}
app/src/main/java/com/yiring/app/web/broadcast/BroadcastController.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.web.broadcast;
import com.yiring.app.param.broadcast.BroadcastParam;
import com.yiring.app.param.broadcast.BroadcastQueryParam;
import com.yiring.app.service.broadcast.BroadcastService;
import com.yiring.app.vo.broadcast.BroadcastVo;
import com.yiring.app.vo.broadcast.BroadcastjcVo;
import com.yiring.common.core.Result;
import com.yiring.common.param.IdParam;
import com.yiring.common.param.IndexParam;
import com.yiring.common.vo.PageVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.locationtech.jts.geom.Point;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
/**
* @author tzl
* @version 1.0
* @description:
* @date 2022/5/6 10:15
*/
@Slf4j
@Validated
@Api(tags = "Broadcast(播报设备管理)")
@RestController
@RequestMapping("/broadcast/")
public class BroadcastController {
@Resource
BroadcastService broadcastService;
@ApiOperation(value = "新增设备信息")
@PostMapping("saveBroadcast")
public Result<String> saveBroadcast(@Valid BroadcastParam broadcastParam) {
return broadcastService.saveBroadcast(broadcastParam);
}
@ApiOperation(value = "删除设备信息")
@PostMapping("deleteBroadcast")
public Result<String> deleteBroadcast(@Valid IdParam idParam) {
return broadcastService.deleteBroadcast(idParam);
}
@ApiOperation(value = "修改设备信息")
@PostMapping("updateBroadcast")
public Result<String> updateBroadcast(@Valid BroadcastParam broadcastParam, @Valid IdParam idParam) {
return broadcastService.updateBroadcast(broadcastParam, idParam);
}
@ApiOperation(value = "查看设备位置")
@GetMapping("selectPoint")
public Result<Point> selectPoint(@Valid IdParam idParam) {
return broadcastService.selectPoint(idParam);
}
@ApiOperation(value = "分页设备信息")
@GetMapping("pageBroadcast")
public Result<PageVo<BroadcastVo>> pageBroadcast(@Valid BroadcastQueryParam broadcastQueryParam) {
return broadcastService.pageBroadcast(broadcastQueryParam);
}
@ApiOperation(value = "导出", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
@PostMapping("exportBroadcast")
public void exportBroadcast(HttpServletResponse response, @Valid BroadcastQueryParam broadcastQueryParam) {
broadcastService.exportBroadcast(broadcastQueryParam, response);
}
@ApiOperation(value = "导入")
@ApiImplicitParams({ @ApiImplicitParam(value = "文件", required = true, name = "file") })
@PostMapping("importVideo")
public Result<String> importVideo(MultipartFile file) {
return broadcastService.importBroadcast(file);
}
@ApiOperation(value = "根据名字检索")
@GetMapping("selectBroadcastName")
public Result<PageVo<BroadcastjcVo>> selectBroadcastName(@Valid IndexParam indexParam) {
return broadcastService.selectBroadcastName(indexParam);
}
}
app/src/main/java/com/yiring/app/web/icon/IconController.java 0 → 100644
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.web.icon;
import com.yiring.app.param.icon.IconParam;
import com.yiring.app.service.icon.IconService;
import com.yiring.app.vo.icon.IconVo;
import com.yiring.common.core.Result;
import com.yiring.common.param.IdParam;
import com.yiring.common.param.PageParam;
import com.yiring.common.vo.PageVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;
import javax.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author tzl
* @version 1.0
* @description:
* @date 2022/5/5 15:18
*/
@Slf4j
@Validated
@Api(tags = "Icon(图标管理)")
@RestController
@RequestMapping("/icon/")
public class IconController {
@Resource
IconService iconService;
@ApiOperation(value = "新增图标信息")
@PostMapping("saveIcon")
public Result<String> saveIcon(@Valid IconParam iconParam) {
return iconService.saveIcon(iconParam);
}
@ApiOperation(value = "删除图标信息")
@PostMapping("deleteIcon")
public Result<String> deleteIcon(@Valid IdParam idParam) {
return iconService.deleteIcon(idParam);
}
@ApiOperation(value = "修改图标信息")
@PostMapping("updateIcon")
public Result<String> updateIcon(@Valid IconParam iconParam, @Valid IdParam idParam) {
return iconService.updateIcon(iconParam, idParam);
}
@ApiOperation(value = "分页图标信息")
@GetMapping("pageIcon")
public Result<PageVo<IconVo>> pageIcon(@Valid PageParam pageParam) {
return iconService.pageIcon(pageParam);
}
}
app/src/main/java/com/yiring/app/web/video/VideoController.java
......@@ -45,7 +45,7 @@ public class VideoController {
@ApiOperation(value = "新增监控点位信息")
@PostMapping("saveVideo")
public Result<String> findLatest(@Valid VideoParam videoParam) {
public Result<String> saveVideo(@Valid VideoParam videoParam) {
return videoService.saveVideo(videoParam);
}
......
app/src/main/java/com/yiring/app/web/visitor/InvitationController.java
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.web.visitor;
import com.yiring.app.param.visitor.InvitationAppQueryParam;
import com.yiring.app.param.visitor.InvitationParam;
import com.yiring.app.param.visitor.InvitationQueryParam;
import com.yiring.app.service.visitor.InvitationService;
import com.yiring.app.vo.visitor.InvitationVo;
import com.yiring.app.vo.visitor.InvitationDetailsVo;
import com.yiring.common.core.Result;
import com.yiring.common.param.IdParam;
import com.yiring.common.vo.PageVo;
......@@ -69,7 +70,7 @@ public class InvitationController {
@ApiOperation(value = "查看邀请信息(分页)")
@GetMapping("pageInv")
public Result<PageVo<InvitationVo>> pageInv(@Valid InvitationQueryParam invitationQueryParam) {
public Result<PageVo<InvitationDetailsVo>> pageInv(@Valid InvitationQueryParam invitationQueryParam) {
return invitationService.pageInv(invitationQueryParam);
}
......@@ -78,4 +79,16 @@ public class InvitationController {
public void exportInv(HttpServletResponse response, @Valid InvitationQueryParam invitationQueryParam) {
invitationService.exportInv(invitationQueryParam, response);
}
@ApiOperation(value = "小程序查看邀请详情")
@GetMapping("detailsInv")
public Result<InvitationDetailsVo> detailsInv(@Valid IdParam idParam) {
return invitationService.detailsInv(idParam);
}
@ApiOperation(value = "小程序查看邀请")
@GetMapping("appGetInv")
public Result<PageVo<InvitationDetailsVo>> appGetInv(@Valid InvitationAppQueryParam invitationAppQueryParam) {
return invitationService.findAllByVisitor_VisitorMobileAndVisitor_Deleted(invitationAppQueryParam);
}
}
app/src/main/java/com/yiring/app/web/visitor/VisitorController.java
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.web.visitor;
import com.yiring.app.param.visitor.VisitorAppQueryParam;
import com.yiring.app.param.visitor.VisitorParam;
import com.yiring.app.param.visitor.VisitorQueryParam;
import com.yiring.app.service.visitor.VisitorService;
import com.yiring.app.vo.visitor.VisitorAppVo;
import com.yiring.app.vo.visitor.VisitorDetailsVo;
import com.yiring.app.vo.visitor.VisitorVo;
import com.yiring.common.core.Result;
import com.yiring.common.param.IdParam;
......@@ -69,7 +72,7 @@ public class VisitorController {
@ApiOperation(value = "查看访客信息详情")
@GetMapping("selectVisitor")
public Result<VisitorVo> selectVisitor(@Valid IdParam idParam) {
public Result<VisitorDetailsVo> selectVisitor(@Valid IdParam idParam) {
return visitorService.selectVisitor(idParam);
}
......@@ -84,4 +87,10 @@ public class VisitorController {
public void exportVisitor(HttpServletResponse response, @Valid VisitorQueryParam visitorQueryParam) {
visitorService.exportVisitor(visitorQueryParam, response);
}
@ApiOperation(value = "小程序查看来访历史(分页)")
@GetMapping("selectInfo")
public Result<PageVo<VisitorAppVo>> selectInfo(@Valid VisitorAppQueryParam visitorAppQueryParam) {
return visitorService.selectInfo(visitorAppQueryParam);
}
}
app/src/main/resources/application.yml
......@@ -9,11 +9,7 @@ spring:
profiles:
include: auth, conf-patch
active: dev
servlet:
multipart:
enabled: true
max-file-size: 10MB
max-request-size: 10MB
# DEBUG
debug: false
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论