数云接口对接，会员操作，积分变更操作

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/constant/CacheConstants.java

@@ -76,4 +76,18 @@ public class CacheConstants
      * 微信小程序 access_token
      */
     public static final long WX_ACCESS_TOKEN_EXPIRATION = 100;
+
+    /**
+     * 数云 access_token Key 缓存
+     */
+    public static final String SHUYUN_ACCESS_TOKEN_CACHE = "shuyun_access_token_cache";
+
+    /**
+     * 数云 access_token 值 HKey缓存
+     */
+    public static final String SHUYUN_ACCESS_TOKEN_CACHE_VALUE = "value";
+    /**
+     * 数云 access_token 有效期 HKey缓存
+     */
+    public static final String SHUYUN_ACCESS_TOKEN_CACHE_EXPIRY = "expiry";
 }

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/constant/SecurityConstants.java

@@ -61,4 +61,9 @@ public class SecurityConstants
      * 角色权限
      */
     public static final String ROLE_PERMISSION = "role_permission";
+
+    /**
+     *
+     */
+    public static final String SHUYUN_REQUEST_TIME = "Gateway-Request-Time";
 }

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxClockLog.java

@@ -5,6 +5,8 @@ import com.flossom.common.core.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.List;
+
 /**
  * 用户打卡对象 wx_clock_log
  *
@@ -52,6 +54,8 @@ public class WxClockLog extends BaseEntity {
     // 微信用户实体
     private WxUserMember wxUserMember;
 
+    private List<WxClockImg> wxClockImgList;
+
     public void setId(Long id) {
         this.id = id;
     }
@@ -108,6 +112,14 @@ public class WxClockLog extends BaseEntity {
         this.wxUserMember = wxUserMember;
     }
 
+    public List<WxClockImg> getWxClockImgList() {
+        return wxClockImgList;
+    }
+
+    public void setWxClockImgList(List<WxClockImg> wxClockImgList) {
+        this.wxClockImgList = wxClockImgList;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMemberClockLog.java

@@ -0,0 +1,136 @@
+package com.flossom.common.core.domain.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.flossom.common.core.annotation.Excel;
+import com.flossom.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 用户打卡对象 WxMemberClockLog
+ *
+ * @author flossom
+ * @date 2024-01-29
+ */
+public class WxMemberClockLog {
+
+    /**
+     * 打卡次数
+     */
+    private Integer clockNum;
+
+    private String headimg;
+
+    private String nickname;
+
+    private Long userId;
+
+    private String mobile;
+
+    private String wecomTagListStr;
+
+    private String miniProgramTagListStr;
+
+    /* 用户注册时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date memberRegisterDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date lastClockTime;
+
+    private String instrumentName;
+
+    private String clockTime;
+
+
+    public Integer getClockNum() {
+        return clockNum;
+    }
+
+    public void setClockNum(Integer clockNum) {
+        this.clockNum = clockNum;
+    }
+
+    public String getHeadimg() {
+        return headimg;
+    }
+
+    public void setHeadimg(String headimg) {
+        this.headimg = headimg;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getWecomTagListStr() {
+        return wecomTagListStr;
+    }
+
+    public void setWecomTagListStr(String wecomTagListStr) {
+        this.wecomTagListStr = wecomTagListStr;
+    }
+
+    public String getMiniProgramTagListStr() {
+        return miniProgramTagListStr;
+    }
+
+    public void setMiniProgramTagListStr(String miniProgramTagListStr) {
+        this.miniProgramTagListStr = miniProgramTagListStr;
+    }
+
+    public Date getMemberRegisterDate() {
+        return memberRegisterDate;
+    }
+
+    public void setMemberRegisterDate(Date memberRegisterDate) {
+        this.memberRegisterDate = memberRegisterDate;
+    }
+
+    public Date getLastClockTime() {
+        return lastClockTime;
+    }
+
+    public void setLastClockTime(Date lastClockTime) {
+        this.lastClockTime = lastClockTime;
+    }
+
+    public String getInstrumentName() {
+        return instrumentName;
+    }
+
+    public void setInstrumentName(String instrumentName) {
+        this.instrumentName = instrumentName;
+    }
+
+    public String getClockTime() {
+        return clockTime;
+    }
+
+    public void setClockTime(String clockTime) {
+        this.clockTime = clockTime;
+    }
+}

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxClockLogExport.java

@@ -0,0 +1,129 @@
+package com.flossom.common.core.domain.export;
+
+import com.flossom.common.core.annotation.Excel;
+
+import java.time.LocalTime;
+import java.util.Date;
+
+/**
+ * 用户护理日志对象
+ *
+ * @author flossom
+ * @date 2024-01-29
+ */
+public class WxClockLogExport {
+
+    @Excel(name = "会员昵称")
+    private String nickname;
+
+    @Excel(name = "用户编号")
+    private Long userId;
+
+    @Excel(name = "手机号")
+    private String mobile;
+
+    @Excel(name = "仪器名称")
+    private String instrumentName;
+
+    @Excel(name = "最新打卡时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date lastClockTime;
+
+    @Excel(name = "累计打卡时间")
+    private String clockTime;
+
+    @Excel(name = "小程序标签")
+    private String miniProgramTagListStr;
+
+    @Excel(name = "累计打卡天数")
+    private Integer clockNum;
+
+    @Excel(name = "外部标签")
+    private String wecomTagListStr;
+
+    @Excel(name = "用户注册时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date memberRegisterDate;
+
+
+    public WxClockLogExport() {
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getInstrumentName() {
+        return instrumentName;
+    }
+
+    public void setInstrumentName(String instrumentName) {
+        this.instrumentName = instrumentName;
+    }
+
+    public Date getLastClockTime() {
+        return lastClockTime;
+    }
+
+    public void setLastClockTime(Date lastClockTime) {
+        this.lastClockTime = lastClockTime;
+    }
+
+    public String getMiniProgramTagListStr() {
+        return miniProgramTagListStr;
+    }
+
+    public void setMiniProgramTagListStr(String miniProgramTagListStr) {
+        this.miniProgramTagListStr = miniProgramTagListStr;
+    }
+
+    public Integer getClockNum() {
+        return clockNum;
+    }
+
+    public void setClockNum(Integer clockNum) {
+        this.clockNum = clockNum;
+    }
+
+    public String getWecomTagListStr() {
+        return wecomTagListStr;
+    }
+
+    public void setWecomTagListStr(String wecomTagListStr) {
+        this.wecomTagListStr = wecomTagListStr;
+    }
+
+    public Date getMemberRegisterDate() {
+        return memberRegisterDate;
+    }
+
+    public void setMemberRegisterDate(Date memberRegisterDate) {
+        this.memberRegisterDate = memberRegisterDate;
+    }
+
+    public String getClockTime() {
+        return clockTime;
+    }
+
+    public void setClockTime(String clockTime) {
+        this.clockTime = clockTime;
+    }
+}

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/UserClockLogReq.java

@@ -0,0 +1,155 @@
+package com.flossom.common.core.domain.req;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 用户打卡日志查询对象
+ *
+ * @author flossom
+ * @date 2024-01-29
+ */
+public class UserClockLogReq {
+
+    /**
+     * 多个用户编号，','隔开
+     */
+    private String userIdList;
+
+    /**
+     * 单个会员昵称
+     */
+    private String nickname;
+
+    /**
+     * 多个手机号码，','隔开
+     */
+    private String mobile;
+
+
+    /**
+     * 外部标签ID列表
+     */
+    private List<Long> wecomTagList;
+
+
+    /**
+     * 小程序标签ID列表
+     */
+    private List<Long> miniProgramTagList;
+
+    /**
+     * 用户注册时间
+     */
+    private List<Date> memberRegisterDateRange;
+
+    /**
+     * 用户打卡时间
+     */
+    private List<Date> clockDateRange;
+
+    /**
+     * 用户最新打卡时间
+     */
+    private List<Date> clockLastDateRange;
+
+    /**
+     * 用户打卡天数
+     */
+    private Integer clockNumStart;
+
+    private Integer clockNumEnd;
+
+    private List<Long> queryUserIdList;
+
+    public UserClockLogReq() {
+    }
+
+    public String getUserIdList() {
+        return userIdList;
+    }
+
+    public void setUserIdList(String userIdList) {
+        this.userIdList = userIdList;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public List<Long> getWecomTagList() {
+        return wecomTagList;
+    }
+
+    public void setWecomTagList(List<Long> wecomTagList) {
+        this.wecomTagList = wecomTagList;
+    }
+
+    public List<Long> getMiniProgramTagList() {
+        return miniProgramTagList;
+    }
+
+    public void setMiniProgramTagList(List<Long> miniProgramTagList) {
+        this.miniProgramTagList = miniProgramTagList;
+    }
+
+    public List<Date> getMemberRegisterDateRange() {
+        return memberRegisterDateRange;
+    }
+
+    public void setMemberRegisterDateRange(List<Date> memberRegisterDateRange) {
+        this.memberRegisterDateRange = memberRegisterDateRange;
+    }
+
+    public List<Date> getClockDateRange() {
+        return clockDateRange;
+    }
+
+    public void setClockDateRange(List<Date> clockDateRange) {
+        this.clockDateRange = clockDateRange;
+    }
+
+    public List<Date> getClockLastDateRange() {
+        return clockLastDateRange;
+    }
+
+    public void setClockLastDateRange(List<Date> clockLastDateRange) {
+        this.clockLastDateRange = clockLastDateRange;
+    }
+
+    public List<Long> getQueryUserIdList() {
+        return queryUserIdList;
+    }
+
+    public void setQueryUserIdList(List<Long> queryUserIdList) {
+        this.queryUserIdList = queryUserIdList;
+    }
+
+    public Integer getClockNumStart() {
+        return clockNumStart;
+    }
+
+    public void setClockNumStart(Integer clockNumStart) {
+        this.clockNumStart = clockNumStart;
+    }
+
+    public Integer getClockNumEnd() {
+        return clockNumEnd;
+    }
+
+    public void setClockNumEnd(Integer clockNumEnd) {
+        this.clockNumEnd = clockNumEnd;
+    }
+}

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxClockLogExportVm.java

@@ -0,0 +1,31 @@
+package com.flossom.common.core.domain.req;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class WxClockLogExportVm extends UserClockLogReq {
+
+    /**
+     * 自定导出字段
+     */
+    private List<String> exportFields = new ArrayList<>();
+
+    private List<Integer> idList = new ArrayList<>();
+
+
+    public List<String> getExportFields() {
+        return exportFields;
+    }
+
+    public void setExportFields(List<String> exportFields) {
+        this.exportFields = exportFields;
+    }
+
+    public List<Integer> getIdList() {
+        return idList;
+    }
+
+    public void setIdList(List<Integer> idList) {
+        this.idList = idList;
+    }
+}

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/shuyun/AccessToken.java

@@ -0,0 +1,85 @@
+package com.flossom.common.core.domain.shuyun;
+
+/**
+ * 数云api的 accessToken 有效期为 1个月
+ * 数云建议一天更新一次
+ */
+public class AccessToken {
+
+    /**
+     * 代表租户的授权值，可能过期的，是否过期看isOverDue
+     */
+    private String accessToken;
+
+    /**
+     * 应用ID
+     */
+    private String appId;
+
+    /**
+     * 0:代表租户级别，1:店铺授权 此字段是为了扩展业务
+     */
+    private String authType;
+
+    /**
+     * 如果是租户级别的授权，则此值代表是哪个租户的授权
+     * 如果是店铺授权，则此值代表是哪个店铺的授权
+     */
+    private String authValue;
+
+    /**
+     * 0:代表已更新 1:代表已过期，如果是授权过期，则需要租户在页面进行手动授权，产生新accessToken
+     */
+    private Integer isOverDue;
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    public void setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+    }
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public String getAuthType() {
+        return authType;
+    }
+
+    public void setAuthType(String authType) {
+        this.authType = authType;
+    }
+
+    public String getAuthValue() {
+        return authValue;
+    }
+
+    public void setAuthValue(String authValue) {
+        this.authValue = authValue;
+    }
+
+    public Integer getIsOverDue() {
+        return isOverDue;
+    }
+
+    public void setIsOverDue(Integer isOverDue) {
+        this.isOverDue = isOverDue;
+    }
+
+    @Override
+    public String toString() {
+        return "AccessToken{" +
+                "accessToken='" + accessToken + '\'' +
+                ", appId='" + appId + '\'' +
+                ", authType='" + authType + '\'' +
+                ", authValue='" + authValue + '\'' +
+                ", isOverDue='" + isOverDue + '\'' +
+                '}';
+    }
+}

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/shuyun/ShuYunMember.java

@@ -0,0 +1,174 @@
+package com.flossom.common.core.domain.shuyun;
+
+/**
+ * 数云的 会员信息
+ */
+public class ShuYunMember {
+
+    /**
+     * 平台客户账号(必填)
+     */
+    private String id;
+
+    /**
+     * 平台编码(必填)
+     */
+    private String platCode;
+
+    /**
+     * 客户注册时使用的店铺ID，非数云店铺ID(必填)
+     */
+    private String shopId;
+
+    /**
+     * 姓名(必填)
+     */
+    private String name;
+
+    /**
+     * 手机号(必填)
+     */
+    private String mobile;
+
+    /**
+     * 生日 yyyy-MM-dd
+     */
+    private String birthday;
+
+    /**
+     * 性别：F(女); M(男)
+     */
+    private String gender;
+
+    /**
+     * 变更时间 yyyy-MM-dd HH:mm:ss
+     */
+    private String created;
+
+    /**
+     * 导购ID，非导购业务可以不填
+     */
+    private String guideId;
+
+    public ShuYunMember() {
+    }
+
+    /**
+     * 新增必填
+     * @param id
+     * @param platCode
+     * @param shopId
+     * @param name
+     * @param mobile
+     */
+    public ShuYunMember(String id, String platCode, String shopId, String name, String mobile) {
+        this.id = id;
+        this.platCode = platCode;
+        this.shopId = shopId;
+        this.name = name;
+        this.mobile = mobile;
+    }
+
+    /**
+     * 查询必填
+     * @param id
+     * @param platCode
+     * @param shopId
+     */
+    public ShuYunMember(String id, String platCode, String shopId) {
+        this.id = id;
+        this.platCode = platCode;
+        this.shopId = shopId;
+    }
+
+    public ShuYunMember(String id, String platCode, String shopId, String mobile) {
+        this.id = id;
+        this.platCode = platCode;
+        this.shopId = shopId;
+        this.mobile = mobile;
+    }
+
+    public ShuYunMember(String id, String platCode, String shopId, String name, String mobile, String birthday, String gender, String created, String guideId) {
+        this.id = id;
+        this.platCode = platCode;
+        this.shopId = shopId;
+        this.name = name;
+        this.mobile = mobile;
+        this.birthday = birthday;
+        this.gender = gender;
+        this.created = created;
+        this.guideId = guideId;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getPlatCode() {
+        return platCode;
+    }
+
+    public void setPlatCode(String platCode) {
+        this.platCode = platCode;
+    }
+
+    public String getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(String shopId) {
+        this.shopId = shopId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    public String getCreated() {
+        return created;
+    }
+
+    public void setCreated(String created) {
+        this.created = created;
+    }
+
+    public String getGuideId() {
+        return guideId;
+    }
+
+    public void setGuideId(String guideId) {
+        this.guideId = guideId;
+    }
+}

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/shuyun/ShuYunPointChange.java

@@ -0,0 +1,183 @@
+package com.flossom.common.core.domain.shuyun;
+
+public class ShuYunPointChange {
+
+    /**
+     * 平台客户账号
+     */
+    private String id;
+
+    /**
+     * 平台编码
+     */
+    private String platCode;
+
+    /**
+     * 客户注册时使用的店铺ID，非数云店铺ID
+     */
+    private String shopId;
+
+    /**
+     * 全局流水号
+     */
+    private String sequence;
+
+    /**
+     * 业务来源
+     * TRADE:订单赠送、
+     * REFUND:退单扣减、
+     * SERVICE:客服、
+     * CONSUME:消费、
+     * EXPIRE:过期、
+     * IMPORT:导入、
+     * MALL:手淘互动、
+     * BRAND:会员通、
+     * OTHER 其他
+     */
+    private String source;
+
+    /**
+     * 变更积分。 正值为发放；负值为消费。
+     */
+    private Integer changePoint;
+
+
+    /**
+     * 变更时间 yyyy-MM-dd HH:mm:ss
+     */
+    private String created;
+
+    /**
+     * 过期时间 yyyy-MM-dd HH:mm:ss
+     */
+    private String expired;
+
+    /**
+     * 操作人
+     */
+    private String operator;
+
+    /**
+     * 描述信息
+     */
+    private String desc;
+
+    public ShuYunPointChange() {
+    }
+
+    /**
+     * 必填选项
+     *
+     * @param id
+     * @param platCode
+     * @param shopId
+     * @param sequence
+     * @param source
+     * @param changePoint
+     * @param created
+     * @param desc
+     */
+    public ShuYunPointChange(String id, String platCode, String shopId, String sequence, String source, Integer changePoint, String created, String desc) {
+        this.id = id;
+        this.platCode = platCode;
+        this.shopId = shopId;
+        this.sequence = sequence;
+        this.source = source;
+        this.changePoint = changePoint;
+        this.created = created;
+        this.desc = desc;
+    }
+
+    public ShuYunPointChange(String id, String platCode, String shopId, String sequence, String source, Integer changePoint, String created, String expired, String operator, String desc) {
+        this.id = id;
+        this.platCode = platCode;
+        this.shopId = shopId;
+        this.sequence = sequence;
+        this.source = source;
+        this.changePoint = changePoint;
+        this.created = created;
+        this.expired = expired;
+        this.operator = operator;
+        this.desc = desc;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getPlatCode() {
+        return platCode;
+    }
+
+    public void setPlatCode(String platCode) {
+        this.platCode = platCode;
+    }
+
+    public String getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(String shopId) {
+        this.shopId = shopId;
+    }
+
+    public String getSequence() {
+        return sequence;
+    }
+
+    public void setSequence(String sequence) {
+        this.sequence = sequence;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public Integer getChangePoint() {
+        return changePoint;
+    }
+
+    public void setChangePoint(Integer changePoint) {
+        this.changePoint = changePoint;
+    }
+
+    public String getCreated() {
+        return created;
+    }
+
+    public void setCreated(String created) {
+        this.created = created;
+    }
+
+    public String getExpired() {
+        return expired;
+    }
+
+    public void setExpired(String expired) {
+        this.expired = expired;
+    }
+
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockLogMapper.java

@@ -1,6 +1,8 @@
 package com.flossom.common.core.mapper;
 
 import com.flossom.common.core.domain.entity.WxClockLog;
+import com.flossom.common.core.domain.entity.WxMemberClockLog;
+import com.flossom.common.core.domain.req.UserClockLogReq;
 import com.flossom.common.core.domain.ret.WxClockLogRet;
 
 import java.util.List;
@@ -63,4 +65,8 @@ public interface WxClockLogMapper {
     Integer selectCountByUserId(WxClockLog queryClockLog);
 
     List<WxClockLogRet> selectWxClockImgRetList(WxClockLog queryClockLog);
+
+    List<WxMemberClockLog> selectMemberClockLogList(UserClockLogReq userClockLogReq);
+
+    List<WxClockLog> detail(UserClockLogReq userClockLogReq);
 }

flossom-common/flossom-common-core/src/main/resources/mapper/WxClockLogMapper.xml

@@ -29,6 +29,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
+    <resultMap type="WxMemberClockLog" id="wxMemberClockLog">
+        <result property="userId"    column="user_id"    />
+        <result property="lastClockTime" column="last_clock_time"/>
+        <result property="clockNum" column="clock_num" />
+        <result property="instrumentName" column="instrument_name" />
+        <result property="clockTime" column="clock_time" />
+    </resultMap>
+
+    <resultMap type="WxClockLog" id="WxClockImgLogResult">
+        <result property="id"    column="id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="instrumentId"    column="instrument_id"    />
+        <result property="instrumentName"    column="instrument_name"    />
+        <result property="clockContent"    column="clock_content"    />
+        <result property="status"    column="status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <collection property="wxClockImgList" ofType="WxClockImg" >
+            <result property="id"    column="img_id"    />
+            <result property="userClockId"    column="user_clock_id"    />
+            <result property="clockImg"    column="clock_img"    />
+        </collection>
+    </resultMap>
+
     <sql id="selectWxClockLogVo">
         select id, user_id, instrument_id, instrument_name, clock_content, status, create_by, create_time, update_by, update_time from wx_clock_log
     </sql>
@@ -59,6 +85,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by create_time desc
     </select>
 
+    <select id="detail" parameterType="WxClockLog" resultMap="WxClockImgLogResult">
+        SELECT
+            log.id, log.user_id, log.instrument_id, log.instrument_name, log.clock_content, log.status,
+            log.create_by, log.create_time, log.update_by, log.update_time, img.id as img_id,
+            img.user_clock_id  as user_clock_id, img.clock_img as clock_img
+        FROM
+            wx_clock_log log
+        LEFT JOIN wx_clock_img img ON log.id = img.user_clock_id
+        <where>
+            <if test="userIdList != null "> and user_id = #{userIdList}</if>
+            <if test="clockDateRange != null and clockDateRange.size > 0">
+                and update_time &gt;= #{clockDateRange[0]}
+            </if>
+            <if test="clockDateRange != null and clockDateRange.size > 0">
+                and update_time &lt;= #{clockDateRange[1]}
+            </if>
+        </where>
+        order by update_time desc
+    </select>
+    
     <select id="selectWxClockLogById" parameterType="Long" resultMap="WxClockLogResult">
         <include refid="selectWxClockLogVo"/>
         where id = #{id}
@@ -83,6 +129,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by create_time desc
     </select>
 
+    <select id="selectMemberClockLogList" parameterType="userClockLogReq" resultMap="wxMemberClockLog">
+        SELECT
+            user_id,
+            MAX( update_time ) AS last_clock_time,
+            GROUP_CONCAT(instrument_name) AS instrument_name,
+            count( 1 ) AS clock_num,
+            GROUP_CONCAT( update_time ) AS clock_time
+        FROM
+            wx_clock_log
+        <where>
+            <if test="clockDateRange != null and clockDateRange.size > 0">
+                and update_time &gt;= #{clockDateRange[0]}
+            </if>
+            <if test="clockDateRange != null and clockDateRange.size > 0">
+                and update_time &lt;= #{clockDateRange[1]}
+            </if>
+        </where>
+        GROUP BY
+            user_id
+        <trim prefix="having" prefixOverrides="and">
+            <if test="queryUserIdList != null and queryUserIdList.size > 0">
+                and user_id in
+                <foreach item="item" collection="queryUserIdList" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="clockLastDateRange != null and clockLastDateRange.size > 0">
+                and last_clock_time &gt;= #{clockLastDateRange[0]}
+            </if>
+            <if test="clockLastDateRange != null and clockLastDateRange.size > 0">
+                and last_clock_time &lt;= #{clockLastDateRange[1]}
+            </if>
+            <if test="clockNumStart != null">
+                and clock_num &gt;= #{clockNumStart}
+            </if>
+            <if test="clockNumEnd != null">
+                and clock_num &lt;= #{clockNumEnd}
+            </if>
+        </trim>
+        ORDER BY
+            last_clock_time DESC
+    </select>
+
     <insert id="insertWxClockLog" parameterType="WxClockLog" useGeneratedKeys="true" keyProperty="id">
         <selectKey keyProperty="id" resultType="Long" order="AFTER">
             SELECT LAST_INSERT_ID()

flossom-common/flossom-common-core/src/main/resources/mapper/WxUserInstrumentLogMapper.xml

@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bindingStatus != null "> and binding_status = #{bindingStatus}</if>
             <if test="status != null "> and status = #{status}</if>
         </where>
-        order by create_time desc
+        order by id desc
     </select>
 
     <select id="selectWxUserInstrumentLogById" parameterType="Long" resultMap="WxUserInstrumentLogResult">

flossom-modules/flossom-mini-program/pom.xml

@@ -102,6 +102,14 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- 数云SDK -->
+        <dependency>
+            <groupId>com.shuyun.open</groupId>
+            <artifactId>open-platform-sdk</artifactId>
+            <version>1.0.2</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/resources/lib/open-platform-sdk.jar</systemPath>
+        </dependency>
     </dependencies>
 
     <build>
@@ -110,6 +118,10 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <!-- 将 resources 目录下的 第三方jar 打包到 自己的 jar 包中 -->
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
                 <executions>
                     <execution>
                         <goals>

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java

@@ -139,6 +139,10 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
             logger.info("serial:{}, 序列号不存在", serial);
             throw new ServiceReturnCodeException(InstrumentHttpCodeEnum.TWO_HUNDRED_AND_FIVE.getInfo(), InstrumentHttpCodeEnum.TWO_HUNDRED_AND_FIVE.getCode());
         }
+        WxInstrument wxInstrument = wxInstrumentMapper.selectWxInstrumentById(wxInstrumentSerial.getInstrumentId());
+        if (wxInstrument != null) {
+            wxInstrumentSerial.setInstrumentName(wxInstrument.getName());
+        }
         return wxInstrumentSerial;
     }
 
@@ -355,7 +359,8 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
 
         // 3.2、更新旧的序列号状态为已解绑
         // 当后管解除了用户和仪器的绑定，状态变为已解绑，无需再次修改序列号的绑定状态
-        if (BindingStatusEnums.UN_BOUND.getCode() == wxUserInstrument.getBindingStatus()) {
+        logger.info("用户仪器绑定状态：{}，需解绑的旧序列号：{}，", wxUserInstrument.getBindingStatus(), wxUserInstrument.getSerial());
+        if (BindingStatusEnums.BINDED.getCode() == wxUserInstrument.getBindingStatus()) {
             WxInstrumentSerial oldUpdate = new WxInstrumentSerial();
             oldUpdate.setBindingStatus(BindingStatusEnums.UN_BOUND.getCode());
             oldUpdate.setSerial(wxUserInstrument.getSerial());
@@ -379,9 +384,11 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
         updateEntity.setUpdateBy(wxUserMember.getNickname());
         updateEntity.setUpdateTime(DateUtils.getNowDate());
         wxUserInstrumentMapper.updateWxUserInstrument(updateEntity);
-        // 3.5、用户仪器关联记录表
+
+        // 3.5、用户仪器关联操作日志表
         // 当后管解除了用户和仪器的绑定，操作记录已记录，无需再次记录
-        if (BindingStatusEnums.UN_BOUND.getCode() == wxUserInstrument.getBindingStatus()) {
+        logger.info("旧序列号日志记录：用户仪器绑定状态：{}", wxUserInstrument.getBindingStatus());
+        if (BindingStatusEnums.BINDED.getCode() == wxUserInstrument.getBindingStatus()) {
             WxUserInstrumentLog oldUserInstrumentLog = new WxUserInstrumentLog();
             oldUserInstrumentLog.setUserInstrumentId(wxUserInstrument.getId());
             oldUserInstrumentLog.setUserId(wxUserMember.getId());
@@ -444,7 +451,10 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
             wxModeTag.setModeId(wxMode.getId());
             List<WxModeTag> wxModeTagList = wxModeTagMapper.selectWxModeTagList(wxModeTag);
             BeanUtils.copyProperties(wxMode, wxModeRet);
+            if(wxMode.getInstrumentType() == 2) {
+                // IOT仪器才可以设置模式时长
                 wxModeRet.setModeTime(LocalTime.of(0, wxMode.getModeTime()));
+            }
             Boolean isLock = false;
             if (wxModeTagList != null && wxModeTagList.size() > 0) {
                 List<Long> modeTagList = wxModeTagList.stream().map(WxModeTag::getTagId).collect(Collectors.toList());

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/shuyun/ShuYunApiUtils.java

@@ -0,0 +1,73 @@
+package com.flossom.miniProgram.utils.shuyun;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.flossom.common.core.constant.CacheConstants;
+import com.flossom.common.core.utils.StringUtils;
+import com.flossom.common.redis.service.RedisService;
+import com.flossom.miniProgram.utils.HttpClientUtils;
+import com.shuyun.open.sdk.bean.HttpMethod;
+import com.shuyun.open.sdk.core.GateWayClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+
+/**
+ * 数云工具类
+ */
+@Component
+public class ShuYunApiUtils {
+
+    protected final static Logger logger = LoggerFactory.getLogger(ShuYunApiUtils.class);
+
+    private static ShuYunConfig shuYunConfig;
+
+    private static RedisService redisService;
+
+    @Autowired
+    public void setShuYunConfig(ShuYunConfig shuYunConfig) {
+        ShuYunApiUtils.shuYunConfig = shuYunConfig;
+    }
+
+    @Autowired
+    public void setRedisService(RedisService redisService) {
+        ShuYunApiUtils.redisService = redisService;
+    }
+
+    public static void refreshAccessToken() throws Exception {
+        String url = "https://open-client.shuyun.com/client/callback/token/" + shuYunConfig.getAppid() + "/v2";
+        logger.info(url);
+        logger.info(HttpClientUtils.get(url));
+    }
+
+
+    public static String getAccessToken(String appid, String secret) throws Exception {
+        String accessToken = redisService.getCacheObject(CacheConstants.SHUYUN_ACCESS_TOKEN_CACHE);
+        if (StringUtils.isBlank(accessToken)) {
+            Map<String, String> params = new LinkedHashMap<>();
+            params.put("platCode", "OFFLINE"); // 暂时固定
+            params.put("shopId", "9005"); // 暂时固定
+            params.put("id", "001");
+            params.put("mobile", "13500000001");
+
+            String requestBody = new ObjectMapper().writeValueAsString(params);
+            String result = GateWayClient.askGateWay(HttpMethod.POST,
+                    shuYunConfig.getUrl(),
+                    null,
+                    requestBody,
+                    shuYunConfig.getAppid(),
+                    shuYunConfig.getSecurity(),
+                    null,
+                    "shuyun.loyalty.member.register");
+
+
+        }
+        return accessToken;
+    }
+
+
+}

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/shuyun/ShuYunConfig.java

@@ -0,0 +1,56 @@
+package com.flossom.miniProgram.utils.shuyun;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 数云接口配置
+ *
+ * @author flossom
+ */
+@Configuration
+@RefreshScope
+@ConfigurationProperties(prefix = "shuyun")
+public class ShuYunConfig {
+
+    /**
+     * 接口地址
+     */
+    private String url;
+
+    /**
+     * 数云 appid
+     */
+    private String appid;
+
+    /**
+     * 数云 security
+     */
+    private String security;
+
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getAppid() {
+        return appid;
+    }
+
+    public void setAppid(String appid) {
+        this.appid = appid;
+    }
+
+    public String getSecurity() {
+        return security;
+    }
+
+    public void setSecurity(String security) {
+        this.security = security;
+    }
+}

flossom-modules/flossom-mini-program/src/main/resources/shuyun.properties

@@ -0,0 +1,3 @@
+http-pool.connect-timeout=60000
+http-pool.connection-request-timeout=60000
+http-pool.socket-timeout=60000

flossom-modules/flossom-system/pom.xml

@@ -99,6 +99,15 @@
             <artifactId>javase</artifactId>
             <version>3.5.1</version>
         </dependency>
+
+        <!-- 数云SDK -->
+        <dependency>
+            <groupId>com.shuyun.open</groupId>
+            <artifactId>open-platform-sdk</artifactId>
+            <version>1.0.2</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/resources/lib/open-platform-sdk.jar</systemPath>
+        </dependency>
     </dependencies>
 
     <build>
@@ -107,6 +116,10 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <!-- 将 resources 目录下的 第三方jar 打包到 自己的 jar 包中 -->
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
                 <executions>
                     <execution>
                         <goals>

flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/ShuYunCallbackController.java

@@ -0,0 +1,65 @@
+package com.flossom.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.flossom.common.core.constant.CacheConstants;
+import com.flossom.common.core.domain.R;
+import com.flossom.common.core.domain.shuyun.AccessToken;
+import com.flossom.common.redis.service.RedisService;
+import com.flossom.system.utils.shuyun.ShuYunConfig;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.*;
+
+/**
+ * 数云回调接口
+ */
+@RestController
+@RequestMapping("/shuyun")
+public class ShuYunCallbackController {
+
+    protected final static Logger logger = LoggerFactory.getLogger(ShuYunCallbackController.class);
+
+    @Autowired
+    private ShuYunConfig shuYunConfig;
+
+    @Autowired
+    private RedisService redisService;
+
+
+    /**
+     * 数云回调接口，获取 accessToken，并将 accessToken 缓存起来
+     */
+    @PostMapping(value = "/accessToken")
+    public R accessToken(@RequestBody List<AccessToken> accessTokenList) {
+        logger.info("数云回调结果accessTokenList: {}", JSON.toJSONString(accessTokenList));
+        /**
+         * 缓存 accessToken
+         */
+        if (accessTokenList != null && accessTokenList.size() > 0) {
+            for (AccessToken accessToken : accessTokenList) {
+                if (accessToken.getIsOverDue() == 0 && StringUtils.equals(accessToken.getAuthValue(), shuYunConfig.getAuthValue())) {
+                    logger.info("缓存数云accessToken：{}", accessToken);
+                    if (StringUtils.isNotBlank(accessToken.getAccessToken())) {
+                        Map<String, Object> map = new HashMap<>();
+                        map.put(CacheConstants.SHUYUN_ACCESS_TOKEN_CACHE_VALUE, JSON.toJSONString(accessToken));
+                        map.put(CacheConstants.SHUYUN_ACCESS_TOKEN_CACHE_EXPIRY, LocalDateTime.now().plusDays(1).atZone(ZoneId.systemDefault()).toEpochSecond());
+                        redisService.setCacheMap(CacheConstants.SHUYUN_ACCESS_TOKEN_CACHE, map);
+                        return R.ok("", "SUCCESS");
+                    }
+                }
+            }
+        }
+        logger.error("缓存数云accessToken失败：{}", accessTokenList);
+        return R.fail();
+    }
+
+}

flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxClockLogController.java

@@ -1,9 +1,16 @@
 package com.flossom.system.controller;
 
+import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import java.util.stream.Collectors;
 
+import com.flossom.common.core.domain.R;
 import com.flossom.common.core.domain.entity.WxClockLog;
+import com.flossom.common.core.domain.entity.WxMemberClockLog;
+import com.flossom.common.core.domain.export.WxClockLogExport;
+import com.flossom.common.core.domain.req.UserClockLogReq;
+import com.flossom.common.core.domain.req.WxClockLogExportVm;
+import com.flossom.common.core.exception.ServiceException;
 import com.flossom.common.core.utils.poi.ExcelUtil;
 import com.flossom.common.core.web.controller.BaseController;
 import com.flossom.common.core.web.domain.AjaxResult;
@@ -11,17 +18,14 @@ import com.flossom.common.core.web.page.TableDataInfo;
 import com.flossom.common.log.annotation.Log;
 import com.flossom.common.log.enums.BusinessType;
 import com.flossom.common.security.annotation.RequiresPermissions;
+import com.flossom.system.service.IWxUserMemberService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.flossom.system.service.IWxClockLogService;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 用户打卡Controller
  *
@@ -35,27 +39,27 @@ public class WxClockLogController extends BaseController {
     @Autowired
     private IWxClockLogService wxClockLogService;
 
+    @Autowired
+    private IWxUserMemberService wxUserMemberService;
+
     /**
      * 查询用户打卡列表
      */
     @RequiresPermissions("system:clockLog:list")
     @GetMapping("/list")
-    public TableDataInfo list(WxClockLog wxClockLog) {
+    public TableDataInfo list(UserClockLogReq userClockLogReq) {
-        startPage();
+        List<WxMemberClockLog> list = wxClockLogService.selectWxClockLogList(userClockLogReq, true);
-        List<WxClockLog> list = wxClockLogService.selectWxClockLogList(wxClockLog);
         return getDataTable(list);
     }
 
     /**
-     * 导出用户打卡列表
+     * 查询用户打卡详情列表
      */
-    @RequiresPermissions("system:clockLog:export")
+    @RequiresPermissions("system:clockLog:list")
-    @Log(title = "用户打卡", businessType = BusinessType.EXPORT)
+    @GetMapping("/detail")
-    @PostMapping("/export")
+    public TableDataInfo detail(UserClockLogReq userClockLogReq) {
-    public void export(HttpServletResponse response, WxClockLog wxClockLog) {
+        List<WxClockLog> list = wxClockLogService.detail(userClockLogReq);
-        List<WxClockLog> list = wxClockLogService.selectWxClockLogList(wxClockLog);
+        return getDataTable(list);
-        ExcelUtil<WxClockLog> util = new ExcelUtil<WxClockLog>(WxClockLog.class);
-        util.exportExcel(response, list, "用户打卡数据");
     }
 
     /**
@@ -96,4 +100,77 @@ public class WxClockLogController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(wxClockLogService.deleteWxClockLogByIds(ids));
     }
+
+    /**
+     * 全量添加小程序标签
+     */
+    @PostMapping("/allAddMiniProgramTag")
+    public R allAddMiniProgramTag(@RequestParam("tagIdList") List<Integer> tagIdList, @RequestBody UserClockLogReq userClockLogReq) {
+        if (tagIdList == null || tagIdList.size() == 0) {
+            logger.error("参数有误");
+            throw new ServiceException("参数有误");
+        }
+        List<WxMemberClockLog> list = wxClockLogService.selectWxClockLogList(userClockLogReq, true);
+        if (list != null && list.size() > 0) {
+            List<Integer> collect = list.stream().map(wxMemberClockLog -> wxMemberClockLog.getUserId().intValue()).collect(Collectors.toList());
+            wxUserMemberService.batchAddMiniProgramTag(tagIdList, collect);
+        }
+        return R.ok();
+    }
+
+    /**
+     * 全量 删除小程序标签
+     */
+    @PostMapping("/allDelMiniProgramTag")
+    public R allDelMiniProgramTag(@RequestParam("tagIdList") List<Integer> tagIdList, @RequestBody UserClockLogReq userClockLogReq) {
+        if (tagIdList == null || tagIdList.size() == 0) {
+            logger.error("参数有误");
+            throw new ServiceException("参数有误");
+        }
+        List<WxMemberClockLog> list = wxClockLogService.selectWxClockLogList(userClockLogReq, true);
+        if (list != null && list.size() > 0) {
+            List<Integer> collect = list.stream().map(wxMemberClockLog -> wxMemberClockLog.getUserId().intValue()).collect(Collectors.toList());
+            wxUserMemberService.batchDelMiniProgramTag(tagIdList, collect);
+        }
+        return R.ok();
+    }
+
+
+    /**
+     * 批量导出护理记录数据
+     */
+    @RequiresPermissions("system:nursingLog:export")
+    @PostMapping("/batchExport")
+    public void batchExport(HttpServletResponse response, WxClockLogExportVm wxClockLogExportVm) {
+        List<Integer> idList = wxClockLogExportVm.getIdList();
+        if (idList == null || idList.size() == 0) {
+            throw new ServiceException("请选择导出数据");
+        }
+        UserClockLogReq userClockLogReq = new UserClockLogReq();
+        userClockLogReq.setQueryUserIdList(wxClockLogExportVm.getIdList().stream().map(Integer::longValue).collect(Collectors.toList()));
+        List<WxMemberClockLog> list = wxClockLogService.selectWxClockLogList(userClockLogReq, false);
+        export(response, list, wxClockLogExportVm.getExportFields());
+    }
+
+    /**
+     * 全量导出护理记录数据
+     */
+    @RequiresPermissions("system:nursingLog:export")
+    @PostMapping("/allExport")
+    public void allExport(HttpServletResponse response, WxClockLogExportVm wxClockLogExportVm) {
+        List<WxMemberClockLog> list = wxClockLogService.selectWxClockLogList(wxClockLogExportVm, false);
+        export(response, list, wxClockLogExportVm.getExportFields());
+    }
+
+    private static void export(HttpServletResponse response, List<WxMemberClockLog> list, List<String> exportFields) {
+        List<WxClockLogExport> exportList = new ArrayList<>();
+        WxClockLogExport export;
+        for (WxMemberClockLog wxMemberClockLog : list) {
+            export = new WxClockLogExport();
+            BeanUtils.copyProperties(wxMemberClockLog, export);
+            exportList.add(export);
+        }
+        ExcelUtil<WxClockLogExport> util = new ExcelUtil(WxClockLogExport.class);
+        util.exportExcel(response, exportList, "打卡记录数据", exportFields);
+    }
 }

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxClockLogService.java

@@ -1,6 +1,8 @@
 package com.flossom.system.service;
 
 import com.flossom.common.core.domain.entity.WxClockLog;
+import com.flossom.common.core.domain.entity.WxMemberClockLog;
+import com.flossom.common.core.domain.req.UserClockLogReq;
 
 import java.util.List;
 
@@ -24,10 +26,10 @@ public interface IWxClockLogService {
     /**
      * 查询用户打卡列表
      *
-     * @param wxClockLog 用户打卡
+     * @param userClockLogReq 用户打卡
      * @return 用户打卡集合
      */
-    public List<WxClockLog> selectWxClockLogList(WxClockLog wxClockLog);
+    public List<WxMemberClockLog> selectWxClockLogList(UserClockLogReq userClockLogReq, boolean isPage);
 
     /**
      * 新增用户打卡
@@ -60,4 +62,6 @@ public interface IWxClockLogService {
      * @return 结果
      */
     public int deleteWxClockLogById(Long id);
+
+    List<WxClockLog> detail(UserClockLogReq userClockLogReq);
 }

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxClockLogServiceImpl.java

@@ -1,10 +1,21 @@
 package com.flossom.system.service.impl;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import com.flossom.common.core.domain.entity.WxClockLog;
+import com.flossom.common.core.domain.entity.WxMemberClockLog;
+import com.flossom.common.core.domain.entity.WxUserMember;
+import com.flossom.common.core.domain.entity.WxUserTag;
+import com.flossom.common.core.domain.req.UserClockLogReq;
+import com.flossom.common.core.domain.req.WxUserMemberVm;
+import com.flossom.common.core.enums.TagTypeStatusEnum;
 import com.flossom.common.core.mapper.WxClockLogMapper;
+import com.flossom.common.core.mapper.WxUserMemberMapper;
+import com.flossom.common.core.mapper.WxUserTagMapper;
 import com.flossom.common.core.utils.DateUtils;
+import com.flossom.common.core.utils.PageUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.flossom.system.service.IWxClockLogService;
@@ -21,6 +32,15 @@ public class WxClockLogServiceImpl implements IWxClockLogService {
     @Autowired
     private WxClockLogMapper wxClockLogMapper;
 
+    @Autowired
+    private WxUserMemberMapper wxUserMemberMapper;
+
+    @Autowired
+    private WxUserTagMapper wxUserTagMapper;
+
+
+
+
     /**
      * 查询用户打卡
      *
@@ -35,12 +55,68 @@ public class WxClockLogServiceImpl implements IWxClockLogService {
     /**
      * 查询用户打卡列表
      *
-     * @param wxClockLog 用户打卡
+     * @param userClockLogReq 用户打卡
      * @return 用户打卡
      */
     @Override
-    public List<WxClockLog> selectWxClockLogList(WxClockLog wxClockLog) {
+    public List<WxMemberClockLog> selectWxClockLogList(UserClockLogReq userClockLogReq, boolean isPage) {
-        return wxClockLogMapper.selectWxClockLogList(wxClockLog);
+        // 查询条件
+        WxUserMemberVm wxUserMemberVm = new WxUserMemberVm();
+        if (!(userClockLogReq.getUserIdList() == null && userClockLogReq.getNickname() == null
+                && userClockLogReq.getMobile() == null && userClockLogReq.getMemberRegisterDateRange() == null
+                && userClockLogReq.getWecomTagList() == null && userClockLogReq.getMiniProgramTagList() == null)) {
+            wxUserMemberVm.setId(userClockLogReq.getUserIdList());
+            wxUserMemberVm.setNickname(userClockLogReq.getNickname());
+            wxUserMemberVm.setMobile(userClockLogReq.getMobile());
+            if (userClockLogReq.getWecomTagList() != null && userClockLogReq.getWecomTagList().size() > 0) {
+                wxUserMemberVm.setWecomTags(userClockLogReq.getWecomTagList().stream().map(Long::intValue).collect(Collectors.toList()));
+                wxUserMemberVm.setWecomTagNum(userClockLogReq.getWecomTagList().size());
+            }
+            if (userClockLogReq.getMiniProgramTagList() != null && userClockLogReq.getMiniProgramTagList().size() > 0) {
+                wxUserMemberVm.setMiniProgramTags(userClockLogReq.getMiniProgramTagList().stream().map(Long::intValue).collect(Collectors.toList()));
+                wxUserMemberVm.setMiniProgramTagNum(userClockLogReq.getMiniProgramTagList().size());
+            }
+            if (userClockLogReq.getMemberRegisterDateRange() != null && userClockLogReq.getMemberRegisterDateRange().size() > 0) {
+                wxUserMemberVm.getParams().put("beginTime", userClockLogReq.getMemberRegisterDateRange().get(0));
+                wxUserMemberVm.getParams().put("endTime", userClockLogReq.getMemberRegisterDateRange().get(1));
+            }
+            List<WxUserMember> wxUserMemberList = wxUserMemberMapper.selectWxUserMemberListByVm(wxUserMemberVm);
+
+            if (wxUserMemberList != null && wxUserMemberList.size() > 0) {
+                userClockLogReq.setQueryUserIdList(wxUserMemberList.stream().map(WxUserMember::getId).collect(Collectors.toList()));
+            } else {
+                userClockLogReq.setQueryUserIdList(Arrays.asList(0L));
+            }
+        }
+
+        if(isPage) {
+            PageUtils.startPage();
+        }
+        List<WxMemberClockLog> wxClockLogList = wxClockLogMapper.selectMemberClockLogList(userClockLogReq);
+        wxClockLogList.forEach(wxMemberClockLog -> {
+            WxUserMember wxUserMember = wxUserMemberMapper.selectWxUserMemberById(wxMemberClockLog.getUserId());
+            if (wxUserMember != null) {
+                // 用户信息
+                wxMemberClockLog.setHeadimg(wxUserMember.getHeadimg());
+                wxMemberClockLog.setMobile(wxUserMember.getMobile());
+                wxMemberClockLog.setNickname(wxUserMember.getNickname());
+                wxMemberClockLog.setMemberRegisterDate(wxUserMember.getCreateTime());
+                // 查询标签
+                WxUserTag wxUserTag = new WxUserTag();
+                wxUserTag.setUserId(wxUserMember.getId());
+                wxUserTag.setType(TagTypeStatusEnum.MINI_PROGRAM.getCode());
+                List<WxUserTag> miniProgramTagList = wxUserTagMapper.selectWxUserTagList(wxUserTag);
+                if (miniProgramTagList != null && miniProgramTagList.size() > 0) {
+                    wxMemberClockLog.setMiniProgramTagListStr(miniProgramTagList.stream().map(WxUserTag::getTagName).collect(Collectors.joining(",")));
+                }
+                wxUserTag.setType(TagTypeStatusEnum.ENTERPRISE_WECHAT.getCode());
+                List<WxUserTag> wecomTagList = wxUserTagMapper.selectWxUserTagList(wxUserTag);
+                if (wecomTagList != null && wecomTagList.size() > 0) {
+                    wxMemberClockLog.setWecomTagListStr(wecomTagList.stream().map(WxUserTag::getTagName).collect(Collectors.joining(",")));
+                }
+            }
+        });
+        return wxClockLogList;
     }
 
     /**
@@ -88,4 +164,11 @@ public class WxClockLogServiceImpl implements IWxClockLogService {
     public int deleteWxClockLogById(Long id) {
         return wxClockLogMapper.deleteWxClockLogById(id);
     }
+
+    @Override
+    public List<WxClockLog> detail(UserClockLogReq userClockLogReq) {
+        return wxClockLogMapper.detail(userClockLogReq);
+    }
+
+
 }

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxNursingLogServiceImpl.java

@@ -75,9 +75,11 @@ public class WxNursingLogServiceImpl implements IWxNursingLogService {
             wxUserMemberVm.setAreaId(userNursingLogReq.getAreaId());
             if (userNursingLogReq.getWecomTagList() != null && userNursingLogReq.getWecomTagList().size() > 0) {
                 wxUserMemberVm.setWecomTags(userNursingLogReq.getWecomTagList().stream().map(Long::intValue).collect(Collectors.toList()));
+                wxUserMemberVm.setWecomTagNum(userNursingLogReq.getWecomTagList().size());
             }
             if (userNursingLogReq.getMiniProgramTagList() != null && userNursingLogReq.getMiniProgramTagList().size() > 0) {
                 wxUserMemberVm.setMiniProgramTags(userNursingLogReq.getMiniProgramTagList().stream().map(Long::intValue).collect(Collectors.toList()));
+                wxUserMemberVm.setMiniProgramTagNum(userNursingLogReq.getMiniProgramTagList().size());
             }
             List<WxUserMember> wxUserMemberList = wxUserMemberMapper.selectWxUserMemberListByVm(wxUserMemberVm);
 

flossom-modules/flossom-system/src/main/java/com/flossom/system/utils/HttpClientUtils.java

@@ -0,0 +1,394 @@
+package com.flossom.system.utils;
+
+
+import com.flossom.common.core.utils.StringUtils;
+import org.apache.http.Consts;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.config.RequestConfig.Builder;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.conn.ConnectTimeoutException;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLContextBuilder;
+import org.apache.http.conn.ssl.TrustStrategy;
+import org.apache.http.conn.ssl.X509HostnameVerifier;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocket;
+import java.io.IOException;
+import java.net.SocketTimeoutException;
+import java.net.URI;
+import java.security.GeneralSecurityException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+public class HttpClientUtils {
+
+    private static final Logger log = LoggerFactory.getLogger(HttpClientUtils.class);
+
+    public static final int connTimeout = 10000;
+    public static final int readTimeout = 10000;
+    public static final String charset = "UTF-8";
+    private static HttpClient client = null;
+
+    static {
+        PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager();
+        cm.setMaxTotal(128);
+        cm.setDefaultMaxPerRoute(128);
+        client = HttpClients.custom().setConnectionManager(cm).build();
+    }
+
+    public static String postJsonParameters(String url, String parameterStr) throws Exception {
+        return postJson(url, parameterStr, charset, connTimeout, readTimeout);
+    }
+
+    public static String postParameters(String url, String parameterStr) throws Exception {
+        return post(url, parameterStr, "application/x-www-form-urlencoded", charset, connTimeout, readTimeout);
+    }
+
+    public static String postParameters(String url, String parameterStr, String charset, Integer connTimeout, Integer readTimeout) throws ConnectTimeoutException, SocketTimeoutException, Exception {
+        return post(url, parameterStr, "application/x-www-form-urlencoded", charset, connTimeout, readTimeout);
+    }
+
+    public static String postParameters(String url, Map<String, String> params) throws ConnectTimeoutException,
+            SocketTimeoutException, Exception {
+        return postForm(url, params, null, connTimeout, readTimeout);
+    }
+
+    public static String postParameters(String url, Map<String, String> params, Integer connTimeout, Integer readTimeout) throws ConnectTimeoutException,
+            SocketTimeoutException, Exception {
+        return postForm(url, params, null, connTimeout, readTimeout);
+    }
+
+    public static String get(String url) throws Exception {
+        return get(url, charset, null, null);
+    }
+
+    public static String get(String url, String charset) throws Exception {
+        return get(url, charset, connTimeout, readTimeout);
+    }
+
+    public static String getParameters(String url, Map<String, String> params) throws Exception {
+        URIBuilder builder = new URIBuilder(url);
+        if (params != null) {
+            for (String key : params.keySet()) {
+                builder.addParameter(key, params.get(key));
+            }
+        }
+        URI uri = builder.build();
+        return get(uri.toString(), charset, null, null);
+    }
+
+    /**
+     * 发送一个 Post 请求, 使用指定的字符集编码.
+     *
+     * @param url
+     * @param body        RequestBody
+     * @param charset     编码
+     * @param connTimeout 建立链接超时时间,毫秒.
+     * @param readTimeout 响应超时时间,毫秒.
+     * @return ResponseBody, 使用指定的字符集编码.
+     * @throws ConnectTimeoutException 建立链接超时异常
+     * @throws SocketTimeoutException  响应超时
+     * @throws Exception
+     */
+    public static String postJson(String url, String body, String charset, Integer connTimeout, Integer readTimeout) throws Exception {
+        HttpClient client = null;
+        HttpPost post = new HttpPost(url);
+        String result = "";
+        try {
+            if (StringUtils.isNotBlank(body)) {
+                HttpEntity entity = new StringEntity(body, ContentType.APPLICATION_JSON);
+                post.setEntity(entity);
+            }
+
+            // 设置参数
+            Builder customReqConf = RequestConfig.custom();
+            if (connTimeout != null) {
+                customReqConf.setConnectTimeout(connTimeout);
+            }
+            if (readTimeout != null) {
+                customReqConf.setSocketTimeout(readTimeout);
+            }
+            post.setConfig(customReqConf.build());
+
+            HttpResponse res;
+            if (url.startsWith("https")) {
+                // 执行 Https 请求.
+                client = createSSLInsecureClient();
+                res = client.execute(post);
+            } else {
+                // 执行 Http 请求.
+                client = HttpClientUtils.client;
+                res = client.execute(post);
+            }
+            result = EntityUtils.toString(res.getEntity(), charset);
+        } catch (Exception ex) {
+            log.error("HttpClient request error!", ex);
+            throw ex;
+        } finally {
+            post.releaseConnection();
+            if (url.startsWith("https") && client != null && client instanceof CloseableHttpClient) {
+                ((CloseableHttpClient) client).close();
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 发送一个 Post 请求, 使用指定的字符集编码.
+     *
+     * @param url
+     * @param body        RequestBody
+     * @param mimeType    例如 application/xml "application/x-www-form-urlencoded" a=1&b=2&c=3
+     * @param charset     编码
+     * @param connTimeout 建立链接超时时间,毫秒.
+     * @param readTimeout 响应超时时间,毫秒.
+     * @return ResponseBody, 使用指定的字符集编码.
+     * @throws ConnectTimeoutException 建立链接超时异常
+     * @throws SocketTimeoutException  响应超时
+     * @throws Exception
+     */
+    public static String post(String url, String body, String mimeType, String charset, Integer connTimeout, Integer readTimeout)
+            throws ConnectTimeoutException, SocketTimeoutException, Exception {
+        HttpClient client = null;
+        HttpPost post = new HttpPost(url);
+        String result = "";
+        try {
+            if (StringUtils.isNotBlank(body)) {
+                HttpEntity entity = new StringEntity(body, ContentType.create(mimeType, charset));
+                post.setEntity(entity);
+            }
+            // 设置参数
+            Builder customReqConf = RequestConfig.custom();
+            if (connTimeout != null) {
+                customReqConf.setConnectTimeout(connTimeout);
+            }
+            if (readTimeout != null) {
+                customReqConf.setSocketTimeout(readTimeout);
+            }
+            post.setConfig(customReqConf.build());
+
+            HttpResponse res;
+            if (url.startsWith("https")) {
+                // 执行 Https 请求.
+                client = createSSLInsecureClient();
+                res = client.execute(post);
+            } else {
+                // 执行 Http 请求.
+                client = HttpClientUtils.client;
+                res = client.execute(post);
+            }
+            result = EntityUtils.toString(res.getEntity(), charset);
+        } catch (Exception ex) {
+            log.error("HttpClient request error!", ex);
+            throw ex;
+        } finally {
+            post.releaseConnection();
+            if (url.startsWith("https") && client != null && client instanceof CloseableHttpClient) {
+                ((CloseableHttpClient) client).close();
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 提交form表单
+     *
+     * @param url
+     * @param params
+     * @param connTimeout
+     * @param readTimeout
+     * @return
+     * @throws ConnectTimeoutException
+     * @throws SocketTimeoutException
+     * @throws Exception
+     */
+    public static String postForm(String url, Map<String, String> params, Map<String, String> headers, Integer connTimeout, Integer readTimeout) throws ConnectTimeoutException,
+            SocketTimeoutException, Exception {
+
+        HttpClient client = null;
+        HttpPost post = new HttpPost(url);
+        try {
+            if (params != null && !params.isEmpty()) {
+                List<NameValuePair> formParams = new ArrayList<NameValuePair>();
+                Set<Entry<String, String>> entrySet = params.entrySet();
+                for (Entry<String, String> entry : entrySet) {
+                    formParams.add(new BasicNameValuePair(entry.getKey(), entry.getValue()));
+                }
+                UrlEncodedFormEntity entity = new UrlEncodedFormEntity(formParams, Consts.UTF_8);
+                post.setEntity(entity);
+            }
+
+            if (headers != null && !headers.isEmpty()) {
+                for (Entry<String, String> entry : headers.entrySet()) {
+                    post.addHeader(entry.getKey(), entry.getValue());
+                }
+            }
+            // 设置参数
+            Builder customReqConf = RequestConfig.custom();
+            if (connTimeout != null) {
+                customReqConf.setConnectTimeout(connTimeout);
+            }
+            if (readTimeout != null) {
+                customReqConf.setSocketTimeout(readTimeout);
+            }
+            post.setConfig(customReqConf.build());
+            HttpResponse res = null;
+            if (url.startsWith("https")) {
+                // 执行 Https 请求.
+                client = createSSLInsecureClient();
+                res = client.execute(post);
+            } else {
+                // 执行 Http 请求.
+                client = HttpClientUtils.client;
+                res = client.execute(post);
+            }
+            return EntityUtils.toString(res.getEntity(), charset);
+        } catch (Exception ex) {
+            log.error("HttpClient request error!", ex);
+            throw ex;
+        } finally {
+            post.releaseConnection();
+            if (url.startsWith("https") && client != null
+                    && client instanceof CloseableHttpClient) {
+                ((CloseableHttpClient) client).close();
+            }
+        }
+    }
+
+    /**
+     * 发送一个 GET 请求
+     *
+     * @param url
+     * @param charset
+     * @param connTimeout 建立链接超时时间,毫秒.
+     * @param readTimeout 响应超时时间,毫秒.
+     * @return
+     * @throws ConnectTimeoutException 建立链接超时
+     * @throws SocketTimeoutException  响应超时
+     * @throws Exception
+     */
+    public static String get(String url, String charset, Integer connTimeout, Integer readTimeout)
+            throws ConnectTimeoutException, SocketTimeoutException, Exception {
+
+        HttpClient client = null;
+        HttpGet get = new HttpGet(url);
+        String result = "";
+        try {
+            // 设置参数
+            Builder customReqConf = RequestConfig.custom();
+            if (connTimeout != null) {
+                customReqConf.setConnectTimeout(connTimeout);
+            }
+            if (readTimeout != null) {
+                customReqConf.setSocketTimeout(readTimeout);
+            }
+            get.setConfig(customReqConf.build());
+
+            HttpResponse res = null;
+
+            if (url.startsWith("https")) {
+                // 执行 Https 请求.
+                client = createSSLInsecureClient();
+                res = client.execute(get);
+            } else {
+                // 执行 Http 请求.
+                client = HttpClientUtils.client;
+                res = client.execute(get);
+            }
+            result = EntityUtils.toString(res.getEntity(), charset);
+        } catch (Exception ex) {
+            log.error("HttpClient request error!", ex);
+            throw ex;
+        } finally {
+            get.releaseConnection();
+            if (url.startsWith("https") && client != null && client instanceof CloseableHttpClient) {
+                ((CloseableHttpClient) client).close();
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 从 response 里获取 charset
+     *
+     * @param ressponse
+     * @return
+     */
+    @SuppressWarnings("unused")
+    private static String getCharsetFromResponse(HttpResponse ressponse) {
+        // Content-Type:text/html; charset=GBK
+        if (ressponse.getEntity() != null && ressponse.getEntity().getContentType() != null && ressponse.getEntity().getContentType().getValue() != null) {
+            String contentType = ressponse.getEntity().getContentType().getValue();
+            if (contentType.contains("charset=")) {
+                return contentType.substring(contentType.indexOf("charset=") + 8);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 创建 SSL连接
+     *
+     * @return
+     * @throws GeneralSecurityException
+     */
+    private static CloseableHttpClient createSSLInsecureClient() throws GeneralSecurityException {
+        try {
+            SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() {
+                public boolean isTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+                    return true;
+                }
+            }).build();
+            SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext, new X509HostnameVerifier() {
+
+                @Override
+                public boolean verify(String arg0, SSLSession arg1) {
+                    return true;
+                }
+
+                @Override
+                public void verify(String host, SSLSocket ssl)
+                        throws IOException {
+                }
+
+                @Override
+                public void verify(String host, X509Certificate cert)
+                        throws SSLException {
+                }
+
+                @Override
+                public void verify(String host, String[] cns,
+                                   String[] subjectAlts) throws SSLException {
+                }
+            });
+            return HttpClients.custom().setSSLSocketFactory(sslsf).build();
+        } catch (GeneralSecurityException e) {
+            throw e;
+        }
+    }
+
+}

flossom-modules/flossom-system/src/main/java/com/flossom/system/utils/shuyun/ActionMethod.java

@@ -0,0 +1,98 @@
+package com.flossom.system.utils.shuyun;
+
+/**
+ * 数云接口方法名称
+ */
+public class ActionMethod {
+
+    /**
+     * 获取token路径标识
+     */
+    private String accessToken;
+
+    /**
+     * 查询会员路径标识（单个会员）
+     */
+    private String queryMember;
+
+    /**
+     * 注册会员路径标识
+     */
+    private String registerMember;
+
+    /**
+     * 修改会员信息路径标识
+     */
+    private String modifyMember;
+
+    /**
+     * 修改会员手机号
+     */
+    private String modifyMemberMobile;
+
+    /**
+     * 解绑会员
+     */
+    private String unbindMember;
+
+    /**
+     * 积分变更
+     */
+    private String pointChange;
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    public void setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+    }
+
+    public String getQueryMember() {
+        return queryMember;
+    }
+
+    public void setQueryMember(String queryMember) {
+        this.queryMember = queryMember;
+    }
+
+    public String getRegisterMember() {
+        return registerMember;
+    }
+
+    public void setRegisterMember(String registerMember) {
+        this.registerMember = registerMember;
+    }
+
+    public String getModifyMember() {
+        return modifyMember;
+    }
+
+    public void setModifyMember(String modifyMember) {
+        this.modifyMember = modifyMember;
+    }
+
+    public String getModifyMemberMobile() {
+        return modifyMemberMobile;
+    }
+
+    public void setModifyMemberMobile(String modifyMemberMobile) {
+        this.modifyMemberMobile = modifyMemberMobile;
+    }
+
+    public String getUnbindMember() {
+        return unbindMember;
+    }
+
+    public void setUnbindMember(String unbindMember) {
+        this.unbindMember = unbindMember;
+    }
+
+    public String getPointChange() {
+        return pointChange;
+    }
+
+    public void setPointChange(String pointChange) {
+        this.pointChange = pointChange;
+    }
+}

flossom-modules/flossom-system/src/main/java/com/flossom/system/utils/shuyun/ShuYunApiUtils.java

@@ -0,0 +1,194 @@
+package com.flossom.system.utils.shuyun;
+
+import com.alibaba.fastjson.JSON;
+import com.flossom.common.core.constant.CacheConstants;
+import com.flossom.common.core.domain.R;
+import com.flossom.common.core.domain.shuyun.AccessToken;
+import com.flossom.common.core.domain.shuyun.ShuYunMember;
+import com.flossom.common.core.domain.shuyun.ShuYunPointChange;
+import com.flossom.common.core.exception.ServiceException;
+import com.flossom.common.redis.service.RedisService;
+import com.flossom.system.utils.HttpClientUtils;
+import com.shuyun.open.sdk.bean.HttpMethod;
+import com.shuyun.open.sdk.core.GateWayClient;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Map;
+
+
+/**
+ * 数云工具类
+ */
+@Component
+public class ShuYunApiUtils {
+
+    protected final static Logger logger = LoggerFactory.getLogger(ShuYunApiUtils.class);
+
+    /**
+     * 数云配置类
+     */
+    private static ShuYunConfig shuYunConfig;
+
+    private static RedisService redisService;
+
+    @Autowired
+    public void setShuYunConfig(ShuYunConfig shuYunConfig) {
+        ShuYunApiUtils.shuYunConfig = shuYunConfig;
+    }
+
+    @Autowired
+    public void setRedisService(RedisService redisService) {
+        ShuYunApiUtils.redisService = redisService;
+    }
+
+    /**
+     * 获取 accessToken，缓存没有就请求数云回调接口，将 accessToken 传递过来
+     */
+    public static String getAccessToken() {
+        Long expiryTime = redisService.getCacheMapValue(CacheConstants.SHUYUN_ACCESS_TOKEN_CACHE, CacheConstants.SHUYUN_ACCESS_TOKEN_CACHE_EXPIRY);
+        if (expiryTime == null || expiryTime == 0 || LocalDateTime.now().atZone(ZoneId.systemDefault()).toEpochSecond() > expiryTime) {
+            String accessTokenUrl = StringUtils.replace(shuYunConfig.getActionMethod().getAccessToken(), "{appid}", shuYunConfig.getAppid());
+            logger.info("刷新accessToken地址：{}", accessTokenUrl);
+            try {
+                String result = HttpClientUtils.get(accessTokenUrl);
+                logger.info("请求数云接口获取accessToken结果：{}", result);
+                R r = JSON.parseObject(result, R.class);
+                if (r.getCode() != R.SUCCESS) {
+                    logger.error("请求数云接口获取accessToken失败，将直接使用旧的accessToken，失败原因：{}", result);
+                }
+            } catch (Exception e) {
+                logger.error("请求数云接口获取accessToken失败，将直接使用旧的accessToken，失败原因：{}", e);
+            }
+        }
+        String accessTokenStr = redisService.getCacheMapValue(CacheConstants.SHUYUN_ACCESS_TOKEN_CACHE, CacheConstants.SHUYUN_ACCESS_TOKEN_CACHE_VALUE);
+        if (StringUtils.isNotBlank(accessTokenStr)) {
+            AccessToken accessToken = JSON.parseObject(accessTokenStr, AccessToken.class);
+            return accessToken.getAccessToken();
+        }
+        /**
+         * 第一次获取会失败，因为回调是异步的，如果还没回调回来，我们就从redis获取缓存了
+         */
+        logger.error("从redis获取数云accessToken失败，缓存中没有accessToken，有可能是第一次调用");
+        throw new ServiceException("从redis获取数云accessToken失败，缓存中没有accessToken，有可能是第一次调用");
+    }
+
+    /**
+     * 请求基础封装方法
+     *
+     * @param httpMethod    请求方式
+     * @param requestParams get请求时，url地址后的参数
+     * @param requestBody   post、put 请求时，请求体的数据
+     * @param actionMethod  请求方法地址
+     */
+    public static R shuYunHttpRequest(HttpMethod httpMethod, Map requestParams, String requestBody, String actionMethod) throws ServiceException {
+        logger.info("数云接口请求地址:{}，参数：requestParams = {}、requestBody = {}", actionMethod, requestParams, requestBody);
+        String result = GateWayClient.askGateWay(
+                httpMethod,
+                shuYunConfig.getUrl(),
+                requestParams,
+                requestBody,
+                shuYunConfig.getAppid(),
+                shuYunConfig.getSecurity(),
+                getAccessToken(),
+                actionMethod);
+        logger.info("返回响应：{}", result);
+        R r = JSON.parseObject(result, R.class);
+        if (r.getCode() == 10000 || r.getCode() == 14000) {
+            return r;
+        } else {
+            logger.error("调用数云接口发生未知错误：{}", result);
+            throw new ServiceException("调用数云接口发生未知错误");
+        }
+    }
+
+
+    /**
+     * 会员注册
+     */
+    public static void registerMember(ShuYunMember member) {
+        try {
+            shuYunHttpRequest(HttpMethod.POST, null, JSON.toJSONString(member),
+                    shuYunConfig.getActionMethod().getRegisterMember());
+        } catch (Exception e) {
+            logger.error("请求数云接口注册会员失败：{}", e);
+            throw new ServiceException("请求数云接口注册会员失败");
+        }
+    }
+
+    /**
+     * 会员查询（单查询）
+     */
+    public static ShuYunMember queryMember(ShuYunMember member) {
+        try {
+            R r = shuYunHttpRequest(HttpMethod.POST, null, JSON.toJSONString(member),
+                    shuYunConfig.getActionMethod().getQueryMember());
+            if (r.getCode() == 10000) {
+                return JSON.parseObject(r.getData().toString(), ShuYunMember.class);
+            }
+            return null;
+        } catch (Exception e) {
+            logger.error("请求数云接口-查询会员信息失败：{}", e);
+            throw new ServiceException("请求数云接口-查询会员信息失败");
+        }
+    }
+
+    /**
+     * 修改会员信息
+     * 手机号不能修改
+     */
+    public static void modifyMember(ShuYunMember member) {
+        try {
+            shuYunHttpRequest(HttpMethod.PUT, null, JSON.toJSONString(member),
+                    shuYunConfig.getActionMethod().getModifyMember());
+        } catch (Exception e) {
+            logger.error("请求数云接口-修改会员信息（除手机号）失败：{}", e);
+            throw new ServiceException("请求数云接口-修改会员信息（除手机号）失败");
+        }
+    }
+
+    /**
+     * 修改会员手机号
+     */
+    public static void modifyMemberMobile(ShuYunMember member) {
+        try {
+            shuYunHttpRequest(HttpMethod.PUT, null, JSON.toJSONString(member),
+                    shuYunConfig.getActionMethod().getModifyMemberMobile());
+        } catch (Exception e) {
+            logger.error("请求数云接口-修改会员手机号失败：{}", e);
+            throw new ServiceException("请求数云接口-修改会员手机号失败");
+        }
+    }
+
+    /**
+     * 解绑会员
+     */
+    public static void unbindMember(ShuYunMember member) {
+        try {
+            shuYunHttpRequest(HttpMethod.POST, null, JSON.toJSONString(member),
+                    shuYunConfig.getActionMethod().getUnbindMember());
+        } catch (Exception e) {
+            logger.error("请求数云接口-解绑会员失败：{}", e);
+            throw new ServiceException("请求数云接口-解绑会员失败");
+        }
+    }
+
+    /**
+     * 积分变更
+     */
+    public static void pointChange(ShuYunPointChange shuYunPointChange) {
+        try {
+            shuYunHttpRequest(HttpMethod.POST, null, JSON.toJSONString(shuYunPointChange),
+                    shuYunConfig.getActionMethod().getPointChange());
+        } catch (Exception e) {
+            logger.error("请求数云接口-会员积分变更失败：{}", e);
+            throw new ServiceException("请求数云接口-会员积分变更失败");
+        }
+    }
+
+}

flossom-modules/flossom-system/src/main/java/com/flossom/system/utils/shuyun/ShuYunConfig.java

@@ -0,0 +1,99 @@
+package com.flossom.system.utils.shuyun;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 数云接口配置
+ *
+ * @author flossom
+ */
+@Configuration
+@RefreshScope
+@ConfigurationProperties(prefix = "shuyun")
+public class ShuYunConfig {
+
+    /**
+     * 接口地址
+     */
+    private String url;
+
+    /**
+     * 数云 appid
+     */
+    private String appid;
+
+    /**
+     * 数云 security
+     */
+    private String security;
+
+    /**
+     * 租户名
+     */
+    private String authValue;
+
+    private String platCode;
+
+    private String shopId;
+
+    private ActionMethod actionMethod;
+
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getAppid() {
+        return appid;
+    }
+
+    public void setAppid(String appid) {
+        this.appid = appid;
+    }
+
+    public String getSecurity() {
+        return security;
+    }
+
+    public void setSecurity(String security) {
+        this.security = security;
+    }
+
+    public ActionMethod getActionMethod() {
+        return actionMethod;
+    }
+
+    public void setActionMethod(ActionMethod actionMethod) {
+        this.actionMethod = actionMethod;
+    }
+
+    public String getPlatCode() {
+        return platCode;
+    }
+
+    public void setPlatCode(String platCode) {
+        this.platCode = platCode;
+    }
+
+    public String getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(String shopId) {
+        this.shopId = shopId;
+    }
+
+    public String getAuthValue() {
+        return authValue;
+    }
+
+    public void setAuthValue(String authValue) {
+        this.authValue = authValue;
+    }
+}

flossom-modules/flossom-system/src/main/resources/shuyun.properties

@@ -0,0 +1,3 @@
+http-pool.connect-timeout=60000
+http-pool.connection-request-timeout=60000
+http-pool.socket-timeout=60000

flossom-ui/src/api/system/clockLog.js

@@ -42,3 +42,29 @@ export function delClockLog(id) {
     method: 'delete'
   })
 }
+
+export function allAddMiniProgramTag(tagIdList, data) {
+  return request({
+    url: '/system/clockLog/allAddMiniProgramTag?tagIdList=' + tagIdList,
+    method: 'post',
+    data: data
+  })
+}
+
+// 全量删除小程序标签
+export function allDelMiniProgramTag(tagIdList, data) {
+  return request({
+    url: '/system/clockLog/allDelMiniProgramTag?tagIdList=' + tagIdList,
+    method: 'post',
+    data: data
+  })
+}
+
+
+export function detail(query) {
+  return request({
+    url: '/system/clockLog/detail',
+    method: 'get',
+    params: query
+  })
+}

flossom-ui/src/views/system/clockLog/index.vue

@@ -3,31 +3,32 @@
     <el-collapse accordion style="margin-bottom: 10px" v-model="activeNames">
       <el-collapse-item name="search">
         <template slot="title">
-          <div class="margin-top" style="border-left: solid 2px #419eff;padding-left: 10px;font-size: 18px !important;color: #000;">
+          <div class="margin-top"
+               style="border-left: solid 2px #419eff;padding-left: 10px;font-size: 18px !important;color: #000;">
             搜索
           </div>
         </template>
         <div style="margin-top: 10px">
-          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-            <div style="display: flex">
+                   label-width="100px">
             <el-popover
               placement="top-start"
               width="200"
               trigger="click"
               content="手机号码和用户编号，满足其中之一内容即可"
             >
-                <el-form-item label="用户编号" prop="id" slot="reference">
+              <el-form-item label="用户编号" prop="userIdList" slot="reference">
                 <el-input
-                    v-model="queryParams.id"
+                  v-model="queryParams.userIdList"
                   placeholder="搜索多个请用英文逗号隔开"
                   clearable
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
             </el-popover>
-              <el-form-item label="会员昵称" prop="userId">
+            <el-form-item label="会员昵称" prop="nickname">
               <el-input
-                  v-model="queryParams.userId"
+                v-model="queryParams.nickname"
                 placeholder="请输入单个会员昵称搜索"
                 clearable
                 @keyup.enter.native="handleQuery"
@@ -47,74 +48,45 @@
                 />
               </el-form-item>
             </el-popover>
-              <el-form-item label="仪器名称" prop="source">
+            <el-form-item label="打卡时间" prop="clockDateRange">
-                <el-select
+              <el-date-picker
-                  v-model="queryParams.instrumentIdArray"
+                style="width: 360px"
-                  placeholder="请选择类型"
+                v-model="queryParams.clockDateRange"
-                  multiple
+                type="datetimerange"
-                  :style="{ width: '100%' }"
+                range-separator="至"
-                  clearable
+                start-placeholder="开始日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                end-placeholder="结束日期"
+                align="right"
               >
-                  <el-option
-                    v-for="item in instrumentList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </div>
-            <div style="display: flex">
-              <el-form-item label="打卡时间" prop="startTime">
-                <el-date-picker clearable
-                                v-model="queryParams.startTime"
-                                type="datetime"
-                                value-format="yyyy-MM-dd HH:mm"
-                                placeholder="请选择操作开始时间">
-                </el-date-picker>
-              </el-form-item>
-              <el-form-item  prop="endTime">
-                <el-date-picker clearable
-                                v-model="queryParams.endTime"
-                                type="datetime"
-                                value-format="yyyy-MM-dd HH:mm"
-                                placeholder="请选择操作结束时间">
-                </el-date-picker>
-              </el-form-item>
-              <el-form-item label="用户注册时间" prop="startTime">
-                <el-date-picker clearable
-                                v-model="queryParams.startTime"
-                                type="datetime"
-                                value-format="yyyy-MM-dd HH:mm"
-                                placeholder="请选择操作开始时间">
-                </el-date-picker>
-              </el-form-item>
-              <el-form-item  prop="endTime">
-                <el-date-picker clearable
-                                v-model="queryParams.endTime"
-                                type="datetime"
-                                value-format="yyyy-MM-dd HH:mm"
-                                placeholder="请选择操作结束时间">
               </el-date-picker>
             </el-form-item>
-              <el-form-item label="最新打卡时间" prop="startTime">
+            <el-form-item label="用户注册时间" prop="memberRegisterDateRange">
-                <el-date-picker clearable
+              <el-date-picker
-                                v-model="queryParams.startTime"
+                style="width: 360px"
-                                type="datetime"
+                v-model="queryParams.memberRegisterDateRange"
-                                value-format="yyyy-MM-dd HH:mm"
+                type="datetimerange"
-                                placeholder="请选择操作开始时间">
+                range-separator="至"
+                start-placeholder="开始日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                end-placeholder="结束日期"
+                align="right"
+              >
               </el-date-picker>
             </el-form-item>
-              <el-form-item  prop="endTime">
+            <el-form-item label="最新打卡时间" prop="clockLastDateRange">
-                <el-date-picker clearable
+              <el-date-picker
-                                v-model="queryParams.endTime"
+                style="width: 360px"
-                                type="datetime"
+                v-model="queryParams.clockLastDateRange"
-                                value-format="yyyy-MM-dd HH:mm"
+                type="datetimerange"
-                                placeholder="请选择操作结束时间">
+                range-separator="至"
+                start-placeholder="开始日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                end-placeholder="结束日期"
+                align="right"
+              >
               </el-date-picker>
             </el-form-item>
-            </div>
-            <div style="display: flex">
             <el-popover
               placement="top-start"
               width="200"
@@ -127,7 +99,7 @@
                 slot="reference"
               >
                 <el-select
-                    v-model="queryParams.wecomTags"
+                  v-model="queryParams.wecomTagList"
                   multiple
                   placeholder="请选择"
                 >
@@ -153,7 +125,7 @@
                 slot="reference"
               >
                 <el-select
-                    v-model="queryParams.miniProgramTags"
+                  v-model="queryParams.miniProgramTagList"
                   multiple
                   placeholder="请选择"
                 >
@@ -167,21 +139,21 @@
                 </el-select>
               </el-form-item>
             </el-popover>
-              <el-form-item label="打卡范围" prop="credit">
+            <el-form-item label="打卡范围" prop="clockNumStart">
               <el-input-number
                 :min="0"
                 :precision="0"
-                  v-model="queryParams.creditStart"
+                v-model="queryParams.clockNumStart"
                 @keyup.enter.native="handleQuery"
               ></el-input-number>
               至
               <el-input-number
                 :min="0"
                 :precision="0"
-                  v-model="queryParams.creditEnd"
+                v-model="queryParams.clockNumEnd"
                 @keyup.enter.native="handleQuery"
               ></el-input-number>
-                <el-button icon="el-icon-close" circle ></el-button>
+              <el-button icon="el-icon-close" circle @click="clearClockNum"></el-button>
             </el-form-item>
             <el-form-item>
               <el-button
@@ -200,7 +172,6 @@
               </el-button
               >
             </el-form-item>
-            </div>
           </el-form>
         </div>
       </el-collapse-item>
@@ -230,14 +201,7 @@
           <el-option label="批量删除小程序标签" :value="2"></el-option>
           <el-option label="全量添加小程序标签" :value="3"></el-option>
           <el-option label="全量删除小程序标签" :value="4"></el-option>
-          <el-option label="批量加减积分" :value="5"></el-option>
+          <el-option label="导出批量数据" :value="12"></el-option>
-          <el-option label="全量加减积分" :value="6"></el-option>
-          <el-option label="批量发送话术" :value="7"></el-option>
-          <el-option label="全量发送话术" :value="8"></el-option>
-          <el-option label="批量备注" :value="9"></el-option>
-          <el-option label="全量备注" :value="10"></el-option>
-          <el-option label="注销账号" :value="11"></el-option>
-          <el-option label="导出数据" :value="12"></el-option>
           <el-option label="导出全量数据" :value="13"></el-option>
         </el-select>
       </el-col>
@@ -247,6 +211,7 @@
           plain
           icon="el-icon-warning"
           size="mini"
+          @click="batchOperate()"
         >确认
         </el-button>
       </el-col>
@@ -259,18 +224,30 @@
 
     <el-table v-loading="loading" :data="clockLogList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="头像" align="center" prop="userId" />
+      <el-table-column label="头像" align="center">
-      <el-table-column label="会员昵称" align="center" prop="userId" />
+        <template slot-scope="scope">
+          <el-avatar shape="circle" :size="50" :src="scope.row.headimg"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="会员昵称" align="center" prop="nickname"/>
       <el-table-column label="用户编号" align="center" prop="userId"/>
-      <el-table-column label="手机号码" align="center" prop="userId" />
+      <el-table-column label="手机号码" align="center" prop="mobile"/>
-      <el-table-column label="仪器名称" align="center" prop="userId" />
+      <el-table-column label="打卡记录" align="center" prop="clockNum" min-width="100">
-      <el-table-column label="打卡记录" align="center" prop="userId" />
+        <template slot-scope="scope">
-      <el-table-column label="打卡天数" align="center" prop="instrumentId" />
+          <el-button
-      <el-table-column label="最新打卡时间" align="center" prop="instrumentName" />
+            size="mini"
-      <el-table-column label="小程序标签" align="center" prop="clockContent" />
+            type="text"
-      <el-table-column label="外部标签" align="center" prop="clockContent" />
+            @click="viewClockDetail(scope.row)"
-      <el-table-column label="用户注册时间" align="center" prop="clockContent" />
+          >
-      <el-table-column label="状态" align="center" prop="status" />
+            {{ '查看详情（' + scope.row.clockNum + '）' }}
+          </el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="打卡天数" align="center" prop="clockNum"/>
+      <el-table-column label="最新打卡时间" align="center" prop="lastClockTime"/>
+      <el-table-column label="小程序标签" align="center" prop="miniProgramTagListStr"/>
+      <el-table-column label="外部标签" align="center" prop="wecomTagListStr"/>
+      <el-table-column label="用户注册时间" align="center" prop="memberRegisterDate"/>
     </el-table>
 
     <pagination
@@ -280,21 +257,133 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+
+    <!-- 小程序标签批量操作   -->
+    <el-dialog :title="this.miniProgramForm.title" :visible.sync="this.miniProgramForm.batchMiniProgramVisible"
+               width="50%" :before-close="cancelMiniProgramDialog">
+      <el-form ref="miniProgramForm" :model="miniProgramForm" :rules="batchMiniProgramRules" label-width="150px">
+        <el-row>
+          <el-col :span="100">
+            <el-form-item label="小程序标签" prop="tagIdArray" label-width="100px">
+              <treeselect
+                v-model="miniProgramForm.tagIdArray"
+                :options="chatTagOptions"
+                :multiple="true"
+                :show-count="true"
+                placeholder="请选择小程序标签"
+                :disable-branch-nodes="true"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancelMiniProgramDialog(false)">重 置</el-button>
+        <el-button type="primary" @click="submitBatchOperate">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 导出字段选择弹窗   -->
+    <el-dialog title="自定义导出字段" :visible.sync="exportFieldsForm.exportFieldsVisible" width="50%"
+               :before-close="cancelExportFieldsDialog">
+      <el-form ref="form" label-width="150px">
+        <el-form-item label="全部字段" prop="allFields">
+          <el-switch v-model="allFields" @click.native="isExportAllFields()"/>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" ref="form" :model="exportFieldList" label-width="150px">
+        <el-form-item label="会员昵称" prop="nickname">
+          <el-switch v-model="exportFieldList.nickname" active-value="nickname" :inactive-value="null"/>
+        </el-form-item>
+        <el-form-item label="用户编号 " prop="userId">
+          <el-switch v-model="exportFieldList.userId" active-value="userId" :inactive-value="null"/>
+        </el-form-item>
+        <el-form-item label="手机号 " prop="mobile">
+          <el-switch v-model="exportFieldList.mobile" active-value="mobile" :inactive-value="null"/>
+        </el-form-item>
+        <el-form-item label="累计打卡仪器名称 " prop="instrumentName">
+          <el-switch v-model="exportFieldList.instrumentName" active-value="instrumentName" :inactive-value="null"/>
+        </el-form-item>
+        <el-form-item label="最新打卡时间 " prop="lastClockTime">
+          <el-switch v-model="exportFieldList.lastClockTime" active-value="lastClockTime" :inactive-value="null"/>
+        </el-form-item>
+        <el-form-item label="累计打卡时间 " prop="clockTime">
+          <el-switch v-model="exportFieldList.clockTime" active-value="clockTime" :inactive-value="null"/>
+        </el-form-item>
+        <el-form-item label="小程序标签 " prop="miniProgramTagListStr">
+          <el-switch v-model="exportFieldList.miniProgramTagListStr" active-value="miniProgramTagListStr"
+                     :inactive-value="null"/>
+        </el-form-item>
+        <el-form-item label="累计打卡天数 " prop="clockNum">
+          <el-switch v-model="exportFieldList.clockNum" active-value="clockNum" :inactive-value="null"/>
+        </el-form-item>
+        <el-form-item label="用户注册时间 " prop="memberRegisterDate">
+          <el-switch v-model="exportFieldList.memberRegisterDate" active-value="memberRegisterDate"
+                     :inactive-value="null"/>
+        </el-form-item>
+        <el-form-item label="外部标签 " prop="wecomTagListStr">
+          <el-switch v-model="exportFieldList.wecomTagListStr" active-value="wecomTagListStr" :inactive-value="null"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancelExportFieldsDialog()">取 消</el-button>
+        <el-button type="primary" @click="submitBatchOperate">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 查看用户积分列表   -->
+    <el-dialog title="打卡记录" :visible.sync="userClockLogVisible" width="90%" :before-close="cancelUserClockLogDialog">
+      <template>
+        <el-table :data="userClockLogQuery.userClockLogList"  :stripe="true" style="width: 100%">
+          <el-table-column type="index" width="50" label="序号" />
+          <el-table-column prop="instrumentName" label="仪器名称" width="300px" />
+          <el-table-column prop="wxClockImgList" label="打卡图片" width="100" style="display: flex">
+            <template slot-scope="scope">
+              <div v-for="(val, index) in scope.row.wxClockImgList" :key="index">
+                <el-image :src="val.clockImg" style="width: 60px;height: 80px" :preview-src-list="[val.clockImg]">
+                  <div slot="placeholder" class="image-slot"><span class="dot"></span>
+                  </div>
+                </el-image>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="clockContent" label="打卡心得" width="300" />
+          <el-table-column prop="updateTime" label="打卡时间" width="200" />
+        </el-table>
+      </template>
+      <pagination
+        v-show="userClockLogQuery.total > 0"
+        :total="userClockLogQuery.total"
+        :page.sync="userClockLogQuery.pageNum"
+        :limit.sync="userClockLogQuery.pageSize"
+        @pagination="getClockLogDetail"
+      />
+    </el-dialog>
+
+
+
   </div>
 </template>
 
 <script>
-import { listClockLog, getClockLog, delClockLog, addClockLog, updateClockLog } from "@/api/system/clockLog";
+import {
+  listClockLog, getClockLog, delClockLog, addClockLog, updateClockLog,
+  allAddMiniProgramTag, allDelMiniProgramTag, detail
+} from "@/api/system/clockLog";
 import {listInstrument} from "@/api/system/instrument";
 import {
-  getMiniProgramTags,
+  getMiniProgramTags, batchAddMiniProgramTag, batchDelMiniProgramTag, getWecomTags,
-  getWecomTags,
 } from '@/api/system/member'
+import {tagTreeSelect} from "@/api/system/wechatTab";
+import Treeselect from '@riophae/vue-treeselect';
+import '@riophae/vue-treeselect/dist/vue-treeselect.css';
+
 export default {
   name: "ClockLog",
+  components: {Treeselect},
   data() {
     return {
-      batchOperateValue: '',
+
       // 折叠搜索
       activeNames: ['search'],
       // 遮罩层
@@ -309,6 +398,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      chatTagOptions: [],
       // 用户打卡表格数据
       clockLogList: [],
       // 仪器表格数据
@@ -325,17 +415,64 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        userIdList: null,
+        nickname: null,
+        mobile: null,
+        wecomTagList: null,
+        miniProgramTagList: null,
+        memberRegisterDateRange: null,
+        clockDateRange: null,
+        clockLastDateRange: null,
+        clockNumStart: undefined,
+        clockNumEnd: undefined,
+      },
+      // 批量操作：小程序标签
+      batchOperateValue: null,
+      miniProgramForm: {
+        title: null,
+        batchMiniProgramVisible: false,
+        tagIdArray: [],
+        userIdList: [],
+      },
+      // 导出数据选择字段
+      exportFieldsForm: {
+        idList: null,
+        exportFields: null,
+        exportFieldsVisible: false,
+      },
+      allFields: false,
+      exportFieldList: {
+        nickname: null,
         userId: null,
-        instrumentId: null,
+        mobile: null,
+        clockNum: null,
+        lastClockTime: null,
+        miniProgramTagListStr: null,
+        wecomTagListStr: null,
+        memberRegisterDate: null,
         instrumentName: null,
-        clockContent: null,
+        clockTime: null,
-        status: null,
+      },
+      // 打卡记录详情列表
+      userClockLogVisible: false,
+      userClockLogQuery: {
+        total: 0,
+        pageNum: 1,
+        pageSize: 10,
+        userClockLogList: null,
+        userIdList: null,
+        clockDateRange: null,
       },
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
+      rules: {},
-      }
+      // 表单校验
+      batchMiniProgramRules: {
+        tagIdArray: [
+          {required: true, message: '请选择小程序标签', trigger: 'change'},
+        ],
+      },
     };
   },
   created() {
@@ -376,17 +513,18 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        id: null,
+        headimg: null,
+        nickname: null,
         userId: null,
-        instrumentId: null,
+        mobile: null,
-        instrumentName: null,
+        clockNum: null,
-        clockContent: null,
+        lastClockTime: null,
-        status: null,
+        miniProgramTagListStr: null,
-        createBy: null,
+        wecomTagListStr: null,
-        createTime: null,
+        memberRegisterDate: null,
-        updateBy: null,
-        updateTime: null
       };
+      this.queryParams.clockNumStart = undefined,
+        this.queryParams.clockNumEnd = undefined,
         this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -402,6 +540,9 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
+      let selectedUserIdList = selection.map(item => item.userId)
+      this.miniProgramForm.userIdList = selectedUserIdList;
+      this.exportFieldsForm.idList = selectedUserIdList;
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -449,14 +590,254 @@ export default {
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {
       this.download('system/clockLog/export', {
         ...this.queryParams
       }, `clockLog_${new Date().getTime()}.xlsx`)
+    },
+    clearClockNum() {
+      this.queryParams.clockNumStart = undefined;
+      this.queryParams.clockNumEnd = undefined;
+    },
+    viewClockDetail(row) {
+      this.userClockLogQuery.userIdList = row.userId;
+      this.userClockLogQuery.clockDateRange = this.queryParams.clockDateRange
+      this.getClockLogDetail();
+      // 打开详情列表
+      this.userClockLogVisible = true;
+    },
+    getClockLogDetail() {
+      detail(this.userClockLogQuery).then(response => {
+        this.userClockLogQuery.total = response.total;
+        this.userClockLogQuery.userClockLogList = response.rows;
+      });
+    },
+    /** 批量操作按钮，显示批量操作弹窗 */
+    batchOperate() {
+      if (this.batchOperateValue == null) {
+        this.$message({
+          message: '请选择要批量操作类型',
+          type: 'warning',
+        })
+        return;
+      } else {
+        /* 批量操作 小程序标签 */
+        if (this.batchOperateValue == 1 || this.batchOperateValue == 2) {
+          if (this.ids.length == 0) {
+            this.$message({
+              message: '请选择要操作的数据',
+              type: 'warning',
+            })
+            return
+          }
+          if (this.batchOperateValue == 1) {
+            this.miniProgramForm.title = '添加小程序标签'
+          }
+          if (this.batchOperateValue == 2) {
+            this.miniProgramForm.title = '删除小程序标签'
+          }
+          // 获取标签树
+          this.getDeptTree()
+          this.miniProgramForm.batchMiniProgramVisible = true
+        }
+        if (this.batchOperateValue == 3 || this.batchOperateValue == 4) {
+          if (this.batchOperateValue == 3) {
+            this.miniProgramForm.title = '添加小程序标签'
+          }
+          if (this.batchOperateValue == 4) {
+            this.miniProgramForm.title = '删除小程序标签'
+          }
+          // 获取标签树
+          this.getDeptTree()
+          this.miniProgramForm.batchMiniProgramVisible = true
+        }
+
+        /* 批量操作：导出数据 */
+        if (this.batchOperateValue == 12) {
+          if (this.ids.length == 0) {
+            this.$message({
+              message: '请选择要操作的数据',
+              type: 'warning',
+            })
+            return
+          }
+          this.exportFieldsForm.exportFieldsVisible = true
+        }
+        if (this.batchOperateValue == 13) {
+          this.exportFieldsForm.exportFieldsVisible = true
+        }
+      }
+    },
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      tagTreeSelect({type: 1}).then((response) => {
+        this.chatTagOptions = response.data
+      })
+    },
+    // 关闭添加小程序标签窗口
+    cancelMiniProgramDialog(isClose) {
+      this.$refs.miniProgramForm.clearValidate();
+      this.miniProgramForm.tagIdArray = []
+      if (isClose) {
+        this.miniProgramForm.title = null
+        this.miniProgramForm.batchMiniProgramVisible = false
+      }
+    },
+    /* 批量操作提交按钮 */
+    submitBatchOperate() {
+      // 批量添加小程序标签
+      if (this.batchOperateValue == 1) {
+        this.$refs['miniProgramForm'].validate((valid) => {
+          if (valid) {
+            batchAddMiniProgramTag(
+              this.miniProgramForm.tagIdArray,
+              Array.from(new Set(this.miniProgramForm.userIdList))
+            ).then((Response) => {
+              this.$modal.msgSuccess('批量添加小程序标签成功');
+              this.cancelMiniProgramDialog(true)
+              this.getList();
+            })
+          }
+        })
+      }
+      // 批量删除小程序标签
+      if (this.batchOperateValue == 2) {
+        this.$refs['miniProgramForm'].validate((valid) => {
+          if (valid) {
+            batchDelMiniProgramTag(
+              this.miniProgramForm.tagIdArray,
+              Array.from(new Set(this.miniProgramForm.userIdList))
+            ).then((Response) => {
+              this.$modal.msgSuccess('批量删除小程序标签成功')
+              this.cancelMiniProgramDialog(true)
+              this.getList();
+            })
           }
+        })
+      }
+      // 全量添加小程序标签
+      if (this.batchOperateValue == 3) {
+        this.$refs['miniProgramForm'].validate((valid) => {
+          if (valid) {
+            allAddMiniProgramTag(
+              this.miniProgramForm.tagIdArray,
+              this.queryParams
+            ).then((Response) => {
+              this.$modal.msgSuccess('全量添加小程序标签成功')
+              this.cancelMiniProgramDialog(true)
+              this.getList();
+            })
+          }
+        })
+      }
+      // 全量删除小程序标签
+      if (this.batchOperateValue == 4) {
+        this.$refs['miniProgramForm'].validate((valid) => {
+          if (valid) {
+            allDelMiniProgramTag(
+              this.miniProgramForm.tagIdArray,
+              this.queryParams
+            ).then((Response) => {
+              this.$modal.msgSuccess('全量删除小程序标签成功')
+              this.cancelMiniProgramDialog(true)
+              this.getList();
+            })
+          }
+        })
+      }
+
+      // 导出用户打卡数据
+      if (this.batchOperateValue == 12) {
+        let exportFields = Object.values(this.exportFieldList).filter(
+          (val) => val != null
+        )
+        if (exportFields.length == 0) {
+          this.$modal.msgError('请选择导出字段')
+          return
+        }
+        this.exportFieldsForm.exportFields = exportFields
+        this.download('/system/clockLog/batchExport', {
+            ...this.exportFieldsForm,
+          },
+          `打卡记录数据_${new Date().getTime()}.xlsx`
+        )
+        this.cancelExportFieldsDialog()
+      }
+      if (this.batchOperateValue == 13) {
+        let exportFields = Object.values(this.exportFieldList).filter(
+          (val) => val != null
+        )
+        if (exportFields.length == 0) {
+          this.$modal.msgError('请选择导出字段')
+          return
+        }
+        this.download(
+          '/system/clockLog/allExport',
+          {
+            ...Object.assign({}, this.queryParams, {
+              exportFields: exportFields,
+            }),
+          },
+          `打卡记录数据_${new Date().getTime()}.xlsx`
+        )
+        this.cancelExportFieldsDialog()
+      }
+    },
+    cancelExportFieldsDialog() {
+      this.allFields = false
+      this.exportFieldsForm.exportFieldsVisible = false
+      this.exportFieldList = {
+        nickname: null,
+        userId: null,
+        mobile: null,
+        clockNum: null,
+        lastClockTime: null,
+        miniProgramTagListStr: null,
+        wecomTagListStr: null,
+        memberRegisterDate: null,
+        instrumentName: null,
+        clockTime: null,
+      }
+    },
+    isExportAllFields() {
+      if (this.allFields) {
+        this.exportFieldList.nickname = "nickname";
+        this.exportFieldList.userId = "userId";
+        this.exportFieldList.mobile = "mobile";
+        this.exportFieldList.clockNum = "clockNum";
+        this.exportFieldList.lastClockTime = "lastClockTime";
+        this.exportFieldList.miniProgramTagListStr = "miniProgramTagListStr";
+        this.exportFieldList.wecomTagListStr = "wecomTagListStr";
+        this.exportFieldList.memberRegisterDate = "memberRegisterDate";
+        this.exportFieldList.instrumentName = "instrumentName";
+        this.exportFieldList.clockTime = "clockTime";
+      } else {
+        this.exportFieldList.nickname = null;
+        this.exportFieldList.userId = null;
+        this.exportFieldList.mobile = null;
+        this.exportFieldList.clockNum = null;
+        this.exportFieldList.lastClockTime = null;
+        this.exportFieldList.miniProgramTagListStr = null;
+        this.exportFieldList.wecomTagListStr = null;
+        this.exportFieldList.memberRegisterDate = null;
+        this.exportFieldList.instrumentName = null;
+        this.exportFieldList.clockTime = null;
+      }
+    },
+    cancelUserClockLogDialog() {
+      this.userClockLogVisible = false
+      this.userClockLogQuery = {
+        total: 0,
+        pageNum: 1,
+        pageSize: 10,
+        userClockLogList: null,
+      }
+    },
+
   }
 };
 </script>

flossom-ui/src/views/system/instrument/index.vue

@@ -2189,12 +2189,62 @@ export default {
 		},
 		/* 仪器类型切换 */
 		typeChange() {
-			// 非IOT仪器
+      /**
-			if (this.form.type == 1) {
+       * 两个都有，但需要根据仪器 仪器类型和仪器型号来查询数据
+       *    模式，带new标识模式
+       */
+      /**
+       * IOT 特有
+       * 仪器型号（默认WL200）
+       * 生成护理记录最短时间
+       *
+       * 蓝牙连接中图片
+       * 蓝牙连接中标题
+       * 蓝牙连接中文案
+       *
+       * 蓝牙连接失败图片
+       * 蓝牙连接失败标题
+       * 蓝牙连接失败文案
+       *
+       * 蓝牙连断开接图片
+       * 蓝牙断开连接标题
+       * 蓝牙断开连接文案
+       *
+       * we200蓝牙连接中图片(WL200仪器特有)
+       * we200蓝牙连接中标题(WL200仪器特有)
+       * we200蓝牙连接中文案(WL200仪器特有)
+       *
+       * IOT版本
+       * IOT升级数据文件
+       * IOT版本升级介绍
+       *
+       * we200IOT版本(WL200仪器特有)
+       * we200IOT升级数据文件(WL200仪器特有)
+       * we200IOT版本升级介绍(WL200仪器特有)
+       */
+      // IOT仪器，模型默认 WL200
+			if (this.form.type == 2) {
+        this.form.model = 'WL200';
+			}
+      /* 模式选项 */
+      // 模式清空
+      this.form.modeIdsValue = [];
+      this.modeIdsOptions = [];
+      // 带 new 标识模式清空
+      this.form.newModeIdList = [];
+      this.newModeOptionList = [];
+			listAllMode({
+				instrumentType: this.form.type,
+				instrumentModel: this.form.model,
+			}).then((response) => {
+				if (response.code != 200) {
+					this.$message.error('模式获取失败')
+				}
+				this.mode.modeIdsOptions = response.data
+			})
+      // 仪器数据清空
       this.form.model = null
       this.form.nursingTime = null
-				this.form.iotVersion = null
-				this.form.iotUpgradeData = null
       this.form.bluetoothConnecting = null
       this.form.bluetoothConnectingTitle = null
       this.form.bluetoothConnectingContent = null
@@ -2204,23 +2254,10 @@ export default {
       this.form.bluetoothClosed = null
       this.form.bluetoothClosedTitle = null
       this.form.bluetoothClosedContent = null
+      this.form.iotVersion = null
+      this.form.iotUpgradeData = null
       this.form.iotVersionUpgrade = null
-				this.form.modeIdsValue = []
+      /* we200数据清空 */
-			} else {
-				this.form.model = 'WL200'
-				this.form.modeIdsValue = []
-			}
-			/* 模式选项 */
-			this.mode.modeIdsOptions = []
-			listAllMode({
-				instrumentType: this.form.type,
-				instrumentModel: this.form.model,
-			}).then((response) => {
-				if (response.code != 200) {
-					this.$message.error('模式获取失败')
-				}
-				this.mode.modeIdsOptions = response.data
-			})
       this.form.we200IotVersion = null;
       this.form.we200IotUpgradeData = null;
       this.form.we200IotVersionUpgrade = null;
@@ -2235,6 +2272,14 @@ export default {
 		modelChange() {
 			/* 模式选项 */
 			this.mode.modeIdsOptions = []
+      // 清空模式和带new标识模式
+      // 模式清空
+      this.form.modeIdsValue = [];
+      this.modeIdsOptions = [];
+      // 带 new 标识模式清空
+      this.form.newModeIdList = [];
+      this.newModeOptionList = [];
+      // 获取对应模式
 			listAllMode({
 				instrumentType: this.form.type,
 				instrumentModel: this.form.model,
@@ -2244,7 +2289,7 @@ export default {
 				}
 				this.mode.modeIdsOptions = response.data
 			})
-
+      /* 清空we200 对应的数据 */
       this.form.we200IotVersion = null;
       this.form.we200IotUpgradeData = null;
       this.form.we200IotVersionUpgrade = null;

flossom-ui/src/views/system/mode/index.vue

@@ -200,7 +200,7 @@
             </el-form-item>
           </el-col>
           <el-col :span ="12">
-            <el-form-item label="自定义组合" prop="isCustomMode" v-if="(form.modeType != 'MaskCustom'&&form.instrumentType==2)" label-width="100px">
+            <el-form-item label="自定义组合" prop="isCustomMode" v-if="(form.modeType != 'MaskCustom'&&form.instrumentType==2&&form.instrumentModel=='WL200')" label-width="100px">
               <el-select v-model="form.isCustomMode">
                 <el-option label="是" :value="1"></el-option>
                 <el-option label="否" :value="0"></el-option>
@@ -733,7 +733,7 @@ export default {
       this.form.serviceData = this.serviceData;
       let flag = false;
       let serverImageFlag = false;
-      if (this.form.serviceData.length > 0) {
+      if (this.form.instrumentType == 2 && this.form.serviceData.length > 0) {
         this.form.serviceData.forEach(data => {
           if(data.startTimeArray == null || data.startTimeArray.length == 0) {
             flag = true;
@@ -754,15 +754,12 @@ export default {
           }
 
         })
-      } else {
-        this.$message.error("启动/暂停图片不能为空");
-        return;
       }
       if (flag) {
         this.$message.error("护理时间范围不能为空");
         return;
       }
-      if (serverImageFlag) {
+      if (this.form.instrumentType == 2 && !serverImageFlag) {
         this.$message.error("启动/暂停图片不能为空");
         return;
       }