From 75b611e724c8c43fae728557f90ed80a7c703dfd Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Mon, 29 Jan 2024 11:38:21 +0800 Subject: [PATCH 01/30] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=89=93=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/entity/WxClockImg.java | 83 +++++++++++ .../domain/entity/WxClockInstrumentLog.java | 98 +++++++++++++ .../common/core/domain/entity/WxClockLog.java | 113 +++++++++++++++ .../common/core/domain/req/WxClockLogReq.java | 46 ++++++ .../common/core/mapper/WxClockImgMapper.java | 62 ++++++++ .../mapper/WxClockInstrumentLogMapper.java | 62 ++++++++ .../common/core/mapper/WxClockLogMapper.java | 61 ++++++++ .../resources/mapper/WxClockImgMapper.xml | 74 ++++++++++ .../mapper/WxClockInstrumentLogMapper.xml | 85 +++++++++++ .../resources/mapper/WxClockLogMapper.xml | 91 ++++++++++++ .../controller/WxClockLogController.java | 48 +++++++ .../service/IWxClockLogService.java | 10 ++ .../service/impl/WxClockLogServiceImpl.java | 135 ++++++++++++++++++ 13 files changed, 968 insertions(+) create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxClockImg.java create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxClockInstrumentLog.java create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxClockLog.java create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxClockLogReq.java create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockImgMapper.java create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockInstrumentLogMapper.java create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockLogMapper.java create mode 100644 flossom-common/flossom-common-core/src/main/resources/mapper/WxClockImgMapper.xml create mode 100644 flossom-common/flossom-common-core/src/main/resources/mapper/WxClockInstrumentLogMapper.xml create mode 100644 flossom-common/flossom-common-core/src/main/resources/mapper/WxClockLogMapper.xml create mode 100644 flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java create mode 100644 flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxClockLogService.java create mode 100644 flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxClockImg.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxClockImg.java new file mode 100644 index 0000000..4c486b1 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxClockImg.java @@ -0,0 +1,83 @@ +package com.flossom.common.core.domain.entity; + +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; + +/** + * 用户打卡图片关联对象 wx_clock_img + * + * @author flossom + * @date 2024-01-27 + */ +public class WxClockImg extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * $column.columnComment + */ + private Long id; + + /** + * 打卡ID + */ + @Excel(name = "打卡ID") + private Long userClockId; + + /** + * 打卡图片 + */ + @Excel(name = "打卡图片") + private String clockImg; + + /** + * 状态（0正常 1停用） + */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private Long status; + + public void setId(Long id) { + this.id = id; + } + + public Long getId() { + return id; + } + + public void setUserClockId(Long userClockId) { + this.userClockId = userClockId; + } + + public Long getUserClockId() { + return userClockId; + } + + public void setClockImg(String clockImg) { + this.clockImg = clockImg; + } + + public String getClockImg() { + return clockImg; + } + + public void setStatus(Long status) { + this.status = status; + } + + public Long getStatus() { + return status; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("userClockId", getUserClockId()) + .append("clockImg", getClockImg()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxClockInstrumentLog.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxClockInstrumentLog.java new file mode 100644 index 0000000..de2f4e9 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxClockInstrumentLog.java @@ -0,0 +1,98 @@ +package com.flossom.common.core.domain.entity; + +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; + +/** + * 微信用户使用仪器记录对象 wx_clock_instrument_log + * + * @author flossom + * @date 2024-01-29 + */ +public class WxClockInstrumentLog extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * $column.columnComment + */ + private Long id; + + /** + * 用户ID + */ + @Excel(name = "用户ID") + private Long userId; + + /** + * 仪器ID + */ + @Excel(name = "仪器ID") + private Long instrumentId; + + /** + * 仪器名称 + */ + @Excel(name = "仪器名称") + private String instrumentName; + + /** + * 状态（0正常 1停用） + */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private Long status; + + public void setId(Long id) { + this.id = id; + } + + public Long getId() { + return id; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Long getUserId() { + return userId; + } + + public void setInstrumentId(Long instrumentId) { + this.instrumentId = instrumentId; + } + + public Long getInstrumentId() { + return instrumentId; + } + + public void setInstrumentName(String instrumentName) { + this.instrumentName = instrumentName; + } + + public String getInstrumentName() { + return instrumentName; + } + + public void setStatus(Long status) { + this.status = status; + } + + public Long getStatus() { + return status; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("userId", getUserId()) + .append("instrumentId", getInstrumentId()) + .append("instrumentName", getInstrumentName()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxClockLog.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxClockLog.java new file mode 100644 index 0000000..80a5e38 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxClockLog.java @@ -0,0 +1,113 @@ +package com.flossom.common.core.domain.entity; + +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; + +/** + * 用户打卡对象 wx_clock_log + * + * @author flossom + * @date 2024-01-29 + */ +public class WxClockLog extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * $column.columnComment + */ + private Long id; + + /** + * 微信用户 + */ + @Excel(name = "微信用户") + private Long userId; + + /** + * 当天使用过的仪器 + */ + @Excel(name = "当天使用过的仪器") + private String instrumentId; + + /** + * 当天使用过的仪器 + */ + @Excel(name = "当天使用过的仪器") + private String instrumentName; + + /** + * 打卡心得 + */ + @Excel(name = "打卡心得") + private String clockContent; + + /** + * 状态（0正常 1停用） + */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private Long status; + + public void setId(Long id) { + this.id = id; + } + + public Long getId() { + return id; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Long getUserId() { + return userId; + } + + public void setInstrumentId(String instrumentId) { + this.instrumentId = instrumentId; + } + + public String getInstrumentId() { + return instrumentId; + } + + public void setInstrumentName(String instrumentName) { + this.instrumentName = instrumentName; + } + + public String getInstrumentName() { + return instrumentName; + } + + public void setClockContent(String clockContent) { + this.clockContent = clockContent; + } + + public String getClockContent() { + return clockContent; + } + + public void setStatus(Long status) { + this.status = status; + } + + public Long getStatus() { + return status; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("userId", getUserId()) + .append("instrumentId", getInstrumentId()) + .append("instrumentName", getInstrumentName()) + .append("clockContent", getClockContent()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxClockLogReq.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxClockLogReq.java new file mode 100644 index 0000000..d1a7da7 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxClockLogReq.java @@ -0,0 +1,46 @@ +package com.flossom.common.core.domain.req; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.util.List; + +/** + * 用户打卡对象 wx_clock_log + * + * @author flossom + * @date 2024-01-27 + */ +public class WxClockLogReq { + + /** + * 打卡心得 + */ + @NotBlank(message = "请输入打卡心得") + @Size(min = 1, max = 120, message = "内容限制120个字符以内") + private String clockContent; + + /** + * 打卡照片 + */ + @NotNull(message = "请上传打卡图片") + @Size(min = 1, max = 3, message = "打卡图片数限制在3张以内") + List clockImageList; + + public String getClockContent() { + return clockContent; + } + + public void setClockContent(String clockContent) { + this.clockContent = clockContent; + } + + public List getClockImageList() { + return clockImageList; + } + + public void setClockImageList(List clockImageList) { + this.clockImageList = clockImageList; + } + +} diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockImgMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockImgMapper.java new file mode 100644 index 0000000..48012a5 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockImgMapper.java @@ -0,0 +1,62 @@ +package com.flossom.common.core.mapper; + +import com.flossom.common.core.domain.entity.WxClockImg; + +import java.util.List; + + +/** + * 用户打卡图片关联Mapper接口 + * + * @author flossom + * @date 2024-01-27 + */ +public interface WxClockImgMapper { + /** + * 查询用户打卡图片关联 + * + * @param id 用户打卡图片关联主键 + * @return 用户打卡图片关联 + */ + public WxClockImg selectWxClockImgById(Long id); + + /** + * 查询用户打卡图片关联列表 + * + * @param wxClockImg 用户打卡图片关联 + * @return 用户打卡图片关联集合 + */ + public List selectWxClockImgList(WxClockImg wxClockImg); + + /** + * 新增用户打卡图片关联 + * + * @param wxClockImg 用户打卡图片关联 + * @return 结果 + */ + public int insertWxClockImg(WxClockImg wxClockImg); + + /** + * 修改用户打卡图片关联 + * + * @param wxClockImg 用户打卡图片关联 + * @return 结果 + */ + public int updateWxClockImg(WxClockImg wxClockImg); + + /** + * 删除用户打卡图片关联 + * + * @param id 用户打卡图片关联主键 + * @return 结果 + */ + public int deleteWxClockImgById(Long id); + + /** + * 批量删除用户打卡图片关联 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWxClockImgByIds(Long[] ids); +} diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockInstrumentLogMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockInstrumentLogMapper.java new file mode 100644 index 0000000..8afdaca --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockInstrumentLogMapper.java @@ -0,0 +1,62 @@ +package com.flossom.common.core.mapper; + +import com.flossom.common.core.domain.entity.WxClockInstrumentLog; + +import java.util.List; + + +/** + * 微信用户使用仪器记录Mapper接口 + * + * @author flossom + * @date 2024-01-29 + */ +public interface WxClockInstrumentLogMapper { + /** + * 查询微信用户使用仪器记录 + * + * @param id 微信用户使用仪器记录主键 + * @return 微信用户使用仪器记录 + */ + public WxClockInstrumentLog selectWxClockInstrumentLogById(Long id); + + /** + * 查询微信用户使用仪器记录列表 + * + * @param wxClockInstrumentLog 微信用户使用仪器记录 + * @return 微信用户使用仪器记录集合 + */ + public List selectWxClockInstrumentLogList(WxClockInstrumentLog wxClockInstrumentLog); + + /** + * 新增微信用户使用仪器记录 + * + * @param wxClockInstrumentLog 微信用户使用仪器记录 + * @return 结果 + */ + public int insertWxClockInstrumentLog(WxClockInstrumentLog wxClockInstrumentLog); + + /** + * 修改微信用户使用仪器记录 + * + * @param wxClockInstrumentLog 微信用户使用仪器记录 + * @return 结果 + */ + public int updateWxClockInstrumentLog(WxClockInstrumentLog wxClockInstrumentLog); + + /** + * 删除微信用户使用仪器记录 + * + * @param id 微信用户使用仪器记录主键 + * @return 结果 + */ + public int deleteWxClockInstrumentLogById(Long id); + + /** + * 批量删除微信用户使用仪器记录 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWxClockInstrumentLogByIds(Long[] ids); +} diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockLogMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockLogMapper.java new file mode 100644 index 0000000..7740ee9 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockLogMapper.java @@ -0,0 +1,61 @@ +package com.flossom.common.core.mapper; + +import com.flossom.common.core.domain.entity.WxClockLog; + +import java.util.List; + +/** + * 用户打卡Mapper接口 + * + * @author flossom + * @date 2024-01-29 + */ +public interface WxClockLogMapper { + /** + * 查询用户打卡 + * + * @param id 用户打卡主键 + * @return 用户打卡 + */ + public WxClockLog selectWxClockLogById(Long id); + + /** + * 查询用户打卡列表 + * + * @param wxClockLog 用户打卡 + * @return 用户打卡集合 + */ + public List selectWxClockLogList(WxClockLog wxClockLog); + + /** + * 新增用户打卡 + * + * @param wxClockLog 用户打卡 + * @return 结果 + */ + public int insertWxClockLog(WxClockLog wxClockLog); + + /** + * 修改用户打卡 + * + * @param wxClockLog 用户打卡 + * @return 结果 + */ + public int updateWxClockLog(WxClockLog wxClockLog); + + /** + * 删除用户打卡 + * + * @param id 用户打卡主键 + * @return 结果 + */ + public int deleteWxClockLogById(Long id); + + /** + * 批量删除用户打卡 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWxClockLogByIds(Long[] ids); +} diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockImgMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockImgMapper.xml new file mode 100644 index 0000000..59c5580 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockImgMapper.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + select id, user_clock_id, clock_img, status, create_by, create_time from wx_clock_img + + + + + + + + insert into wx_clock_img + + user_clock_id, + clock_img, + status, + create_by, + create_time, + + + #{userClockId}, + #{clockImg}, + #{status}, + #{createBy}, + #{createTime}, + + + + + update wx_clock_img + + user_clock_id = #{userClockId}, + clock_img = #{clockImg}, + status = #{status}, + create_by = #{createBy}, + create_time = #{createTime}, + + where id = #{id} + + + + delete from wx_clock_img where id = #{id} + + + + delete from wx_clock_img where id in + + #{id} + + + \ No newline at end of file diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockInstrumentLogMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockInstrumentLogMapper.xml new file mode 100644 index 0000000..7f89c92 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockInstrumentLogMapper.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + select id, user_id, instrument_id, instrument_name, status, create_by, create_time from wx_clock_instrument_log + + + + + + + + insert into wx_clock_instrument_log + + user_id, + instrument_id, + instrument_name, + status, + create_by, + create_time, + + + #{userId}, + #{instrumentId}, + #{instrumentName}, + #{status}, + #{createBy}, + #{createTime}, + + + + + update wx_clock_instrument_log + + user_id = #{userId}, + instrument_id = #{instrumentId}, + instrument_name = #{instrumentName}, + status = #{status}, + create_by = #{createBy}, + create_time = #{createTime}, + + where id = #{id} + + + + delete from wx_clock_instrument_log where id = #{id} + + + + delete from wx_clock_instrument_log where id in + + #{id} + + + \ No newline at end of file diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockLogMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockLogMapper.xml new file mode 100644 index 0000000..82bcb9e --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockLogMapper.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + select id, user_id, instrument_id, instrument_name, clock_content, status, create_by, create_time from wx_clock_log + + + + + + + + insert into wx_clock_log + + user_id, + instrument_id, + instrument_name, + clock_content, + status, + create_by, + create_time, + + + #{userId}, + #{instrumentId}, + #{instrumentName}, + #{clockContent}, + #{status}, + #{createBy}, + #{createTime}, + + + + + update wx_clock_log + + user_id = #{userId}, + instrument_id = #{instrumentId}, + instrument_name = #{instrumentName}, + clock_content = #{clockContent}, + status = #{status}, + create_by = #{createBy}, + create_time = #{createTime}, + + where id = #{id} + + + + delete from wx_clock_log where id = #{id} + + + + delete from wx_clock_log where id in + + #{id} + + + \ No newline at end of file diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java new file mode 100644 index 0000000..75dbf22 --- /dev/null +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java @@ -0,0 +1,48 @@ +package com.flossom.miniProgram.controller; + +import com.flossom.common.core.domain.R; +import com.flossom.common.core.domain.req.WxClockLogReq; +import com.flossom.common.core.web.controller.BaseController; +import com.flossom.miniProgram.service.IWxClockLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotNull; + +/** + * 用户打卡Controller + * + * @author flossom + * @date 2024-01-27 + */ +@RestController +@RequestMapping("/clock") +public class WxClockLogController extends BaseController { + + @Autowired + private IWxClockLogService wxClockLogService; + + /** + * 添加用户使用仪器记录表 + */ + @GetMapping("/addClockInstrument") + public R addClockInstrument(@NotNull(message = "请选择仪器ID") @RequestParam("instrumentId") Long instrumentId) { + wxClockLogService.addClockInstrument(instrumentId); + return R.ok(); + } + + /** + * 新增用户打卡 + * 需要记录当天使用过的全部仪器（打卡前后的全部仪器） + */ + @PostMapping("/insertClockLog") + public R insertClockLog(@Validated @RequestBody WxClockLogReq wxClockLogReq) { + wxClockLogService.insertWxClockLog(wxClockLogReq); + return R.ok(); + } + + + + +} diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxClockLogService.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxClockLogService.java new file mode 100644 index 0000000..c5a34e6 --- /dev/null +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxClockLogService.java @@ -0,0 +1,10 @@ +package com.flossom.miniProgram.service; + +import com.flossom.common.core.domain.req.WxClockLogReq; + +public interface IWxClockLogService { + + public void insertWxClockLog(WxClockLogReq wxClockLogReq); + + void addClockInstrument(Long instrumentId); +} diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java new file mode 100644 index 0000000..9e4fc32 --- /dev/null +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java @@ -0,0 +1,135 @@ +package com.flossom.miniProgram.service.impl; + +import com.flossom.common.core.domain.entity.*; +import com.flossom.common.core.domain.req.WxClockLogReq; +import com.flossom.common.core.enums.Status; +import com.flossom.common.core.mapper.WxClockImgMapper; +import com.flossom.common.core.mapper.WxClockInstrumentLogMapper; +import com.flossom.common.core.mapper.WxClockLogMapper; +import com.flossom.common.core.mapper.WxInstrumentMapper; +import com.flossom.common.core.utils.DateUtils; +import com.flossom.common.security.utils.SecurityUtils; +import com.flossom.miniProgram.service.IWxClockLogService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +@Service +public class WxClockLogServiceImpl implements IWxClockLogService { + + @Autowired + private WxClockLogMapper wxClockLogMapper; + + @Autowired + private WxClockImgMapper wxClockImgMapper; + + @Autowired + private WxClockInstrumentLogMapper wxClockInstrumentLogMapper; + + @Autowired + private WxInstrumentMapper wxInstrumentMapper; + + + @Override + @Transactional + public void insertWxClockLog(WxClockLogReq wxClockLogReq) { + WxUserMember wxUserMember = SecurityUtils.getLoginUser().getWxUserMember(); + // 打卡记录 + WxClockLog wxClockLog = new WxClockLog(); + BeanUtils.copyProperties(wxClockLogReq, wxClockLog); + wxClockLog.setUserId(wxUserMember.getId()); + wxClockLog.setCreateBy(wxUserMember.getNickname()); + wxClockLog.setCreateTime(DateUtils.getNowDate()); + // 当天使用过的仪器 + WxClockInstrumentLog queryInstrumentLog = new WxClockInstrumentLog(); + queryInstrumentLog.setUserId(wxUserMember.getId()); + LocalDateTime now = LocalDateTime.now(); + wxClockLog.getParams().put("beginTime", LocalDateTime.of(now.toLocalDate(), LocalTime.MIN)); + wxClockLog.getParams().put("endTime", LocalDateTime.of(now.toLocalDate(), LocalTime.MAX)); + queryInstrumentLog.setStatus(Status.OK.getCode().longValue()); + List wxClockInstrumentLogList = wxClockInstrumentLogMapper.selectWxClockInstrumentLogList(queryInstrumentLog); + if (wxClockInstrumentLogList != null && wxClockInstrumentLogList.size() > 0) { + String instrumentIdList = wxClockInstrumentLogList.stream() + .map(WxClockInstrumentLog::getInstrumentId) + .distinct() + .map(Objects::toString) + .collect(Collectors.joining(",")); + wxClockLog.setInstrumentId(instrumentIdList); + String instrumentNameList = wxClockInstrumentLogList.stream() + .map(WxClockInstrumentLog::getInstrumentName) + .distinct() + .map(Objects::toString) + .collect(Collectors.joining(",")); + wxClockLog.setInstrumentName(instrumentNameList); + } + wxClockLogMapper.insertWxClockLog(wxClockLog); + + // 打卡图片 + if (wxClockLogReq.getClockImageList() != null && wxClockLogReq.getClockImageList().size() > 0) { + for (String image : wxClockLogReq.getClockImageList()) { + WxClockImg wxClockImg = new WxClockImg(); + wxClockImg.setUserClockId(wxClockLog.getId()); + wxClockImg.setClockImg(image); + wxClockImg.setCreateBy(wxUserMember.getNickname()); + wxClockImg.setCreateTime(DateUtils.getNowDate()); + wxClockImgMapper.insertWxClockImg(wxClockImg); + } + } + + + /** + * TODO：奖励积分 + */ + + } + + @Override + @Transactional + public void addClockInstrument(Long instrumentId) { + // 添加仪器使用记录 + WxClockInstrumentLog wxClockInstrumentLog = new WxClockInstrumentLog(); + wxClockInstrumentLog.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); + wxClockInstrumentLog.setInstrumentId(instrumentId); + WxInstrument wxInstrument = wxInstrumentMapper.selectWxInstrumentById(instrumentId); + if (wxInstrument != null) { + wxClockInstrumentLog.setInstrumentName(wxInstrument.getName()); + } + wxClockInstrumentLog.setStatus(Status.OK.getCode().longValue()); + wxClockInstrumentLog.setCreateBy(SecurityUtils.getLoginUser().getWxUserMember().getNickname()); + wxClockInstrumentLog.setCreateTime(DateUtils.getNowDate()); + wxClockInstrumentLogMapper.insertWxClockInstrumentLog(wxClockInstrumentLog); + + // 查询今天是否有打卡，存在打卡，则将仪器添加到最近一条打卡记录上 + WxClockLog queryClockLog = new WxClockLog(); + queryClockLog.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); + LocalDateTime now = LocalDateTime.now(); + queryClockLog.getParams().put("beginTime", LocalDateTime.of(now.toLocalDate(), LocalTime.MIN)); + queryClockLog.getParams().put("endTime", LocalDateTime.of(now.toLocalDate(), LocalTime.MAX)); + List wxClockLogList = wxClockLogMapper.selectWxClockLogList(queryClockLog); + if (wxClockLogList != null && wxClockLogList.size() > 0) { + // 直接获取最新的打卡记录 + WxClockLog saveClockLog = new WxClockLog(); + WxClockLog newWxClockLog = wxClockLogList.get(0); + // 获取打卡记录的使用过的仪器ID + List usedList = Arrays.asList(newWxClockLog.getInstrumentId().split(",")).stream().map(Long::valueOf).collect(Collectors.toList()); + if (!usedList.contains(instrumentId)) { + saveClockLog.setInstrumentId(newWxClockLog.getInstrumentId() + "," + instrumentId); + WxInstrument instrument = wxInstrumentMapper.selectWxInstrumentById(instrumentId); + if (instrument != null) { + saveClockLog.setInstrumentName(newWxClockLog.getInstrumentName() + "," + instrument.getName()); + } + saveClockLog.setId(newWxClockLog.getId()); + wxClockLogMapper.updateWxClockLog(saveClockLog); + } + } + } +} From b703a9c6b5c952c3a90f7ac86253499956dec294 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Mon, 29 Jan 2024 13:34:45 +0800 Subject: [PATCH 02/30] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=89=93=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/req/WxClockLogReq.java | 3 +- .../controller/WxClockLogController.java | 47 +++++++++++++++++-- 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxClockLogReq.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxClockLogReq.java index d1a7da7..30c1eeb 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxClockLogReq.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxClockLogReq.java @@ -3,6 +3,7 @@ package com.flossom.common.core.domain.req; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; +import java.util.ArrayList; import java.util.List; /** @@ -23,8 +24,6 @@ public class WxClockLogReq { /** * 打卡照片 */ - @NotNull(message = "请上传打卡图片") - @Size(min = 1, max = 3, message = "打卡图片数限制在3张以内") List clockImageList; public String getClockContent() { diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java index 75dbf22..a6c7c80 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java @@ -1,14 +1,20 @@ package com.flossom.miniProgram.controller; +import com.flossom.common.core.constant.Constants; import com.flossom.common.core.domain.R; +import com.flossom.common.core.domain.SysFile; import com.flossom.common.core.domain.req.WxClockLogReq; +import com.flossom.common.core.exception.ServiceException; import com.flossom.common.core.web.controller.BaseController; import com.flossom.miniProgram.service.IWxClockLogService; +import com.flossom.system.api.RemoteFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.validation.constraints.NotNull; +import java.util.ArrayList; /** * 用户打卡Controller @@ -23,6 +29,9 @@ public class WxClockLogController extends BaseController { @Autowired private IWxClockLogService wxClockLogService; + @Autowired + private RemoteFileService remoteFileService; + /** * 添加用户使用仪器记录表 */ @@ -35,14 +44,46 @@ public class WxClockLogController extends BaseController { /** * 新增用户打卡 * 需要记录当天使用过的全部仪器（打卡前后的全部仪器） + * firstClockImg 第一张图片是必须的 */ @PostMapping("/insertClockLog") - public R insertClockLog(@Validated @RequestBody WxClockLogReq wxClockLogReq) { + public R insertClockLog(@RequestParam(value = "firstClockImg") MultipartFile firstClockImg, + @RequestParam(value = "secondClockImg", required = false) MultipartFile secondClockImg, + @RequestParam(value = "thirdClockImg", required = false) MultipartFile thirdClockImg, + @Validated WxClockLogReq wxClockLogReq) { + wxClockLogReq.setClockImageList(new ArrayList<>()); + if (firstClockImg != null) { + R result = remoteFileService.upload(firstClockImg); + if (result.getCode() != Constants.SUCCESS) { + logger.error("上传打卡图片失败"); + throw new ServiceException("上传打卡图片失败"); + } + wxClockLogReq.getClockImageList().add(result.getData().getUrl()); + } + if (secondClockImg != null) { + R result = remoteFileService.upload(secondClockImg); + if (result.getCode() != Constants.SUCCESS) { + logger.error("上传打卡图片失败"); + throw new ServiceException("上传打卡图片失败"); + } + wxClockLogReq.getClockImageList().add(result.getData().getUrl()); + } + if (thirdClockImg != null) { + R result = remoteFileService.upload(thirdClockImg); + if (result.getCode() != Constants.SUCCESS) { + logger.error("上传打卡图片失败"); + throw new ServiceException("上传打卡图片失败"); + } + wxClockLogReq.getClockImageList().add(result.getData().getUrl()); + } + + if (wxClockLogReq.getClockImageList() == null || wxClockLogReq.getClockImageList().size() == 0) { + logger.error("请上传打卡图片"); + throw new ServiceException("请上传打卡图片"); + } wxClockLogService.insertWxClockLog(wxClockLogReq); return R.ok(); } - - } From 7198277d9e134b726de4ed7610393704b6227bae Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Mon, 29 Jan 2024 13:38:38 +0800 Subject: [PATCH 03/30] =?UTF-8?q?=E5=BD=93=E5=A4=A9=E9=A6=96=E6=AC=A1?= =?UTF-8?q?=E6=89=93=E5=8D=A1=E5=A5=96=E5=8A=B1=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxClockLogServiceImpl.java | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java index 9e4fc32..f41af28 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java @@ -43,6 +43,19 @@ public class WxClockLogServiceImpl implements IWxClockLogService { @Transactional public void insertWxClockLog(WxClockLogReq wxClockLogReq) { WxUserMember wxUserMember = SecurityUtils.getLoginUser().getWxUserMember(); + LocalDateTime now = LocalDateTime.now(); + + WxClockLog queryClockLog = new WxClockLog(); + queryClockLog.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); + queryClockLog.getParams().put("beginTime", LocalDateTime.of(now.toLocalDate(), LocalTime.MIN)); + queryClockLog.getParams().put("endTime", LocalDateTime.of(now.toLocalDate(), LocalTime.MAX)); + List wxClockLogList = wxClockLogMapper.selectWxClockLogList(queryClockLog); + if (wxClockLogList == null || wxClockLogList.size() == 0) { + /** + * TODO：当天首次打卡奖励积分 + */ + } + // 打卡记录 WxClockLog wxClockLog = new WxClockLog(); BeanUtils.copyProperties(wxClockLogReq, wxClockLog); @@ -52,7 +65,6 @@ public class WxClockLogServiceImpl implements IWxClockLogService { // 当天使用过的仪器 WxClockInstrumentLog queryInstrumentLog = new WxClockInstrumentLog(); queryInstrumentLog.setUserId(wxUserMember.getId()); - LocalDateTime now = LocalDateTime.now(); wxClockLog.getParams().put("beginTime", LocalDateTime.of(now.toLocalDate(), LocalTime.MIN)); wxClockLog.getParams().put("endTime", LocalDateTime.of(now.toLocalDate(), LocalTime.MAX)); queryInstrumentLog.setStatus(Status.OK.getCode().longValue()); @@ -84,12 +96,6 @@ public class WxClockLogServiceImpl implements IWxClockLogService { wxClockImgMapper.insertWxClockImg(wxClockImg); } } - - - /** - * TODO：奖励积分 - */ - } @Override From ead2a0cc883d81520ee2a863244a6f1e4d0df5f7 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Mon, 29 Jan 2024 14:21:05 +0800 Subject: [PATCH 04/30] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=89=93=E5=8D=A1=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/ret/WxClockLogRet.java | 98 +++++++++++++++++++ .../common/core/mapper/WxClockLogMapper.java | 2 + .../resources/mapper/WxClockLogMapper.xml | 8 ++ .../controller/WxClockLogController.java | 12 ++- .../service/IWxClockLogService.java | 4 + .../service/impl/WxClockLogServiceImpl.java | 32 +++++- 6 files changed, 152 insertions(+), 4 deletions(-) create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxClockLogRet.java diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxClockLogRet.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxClockLogRet.java new file mode 100644 index 0000000..215f8eb --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxClockLogRet.java @@ -0,0 +1,98 @@ +package com.flossom.common.core.domain.ret; + +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.ArrayList; +import java.util.List; + +/** + * 用户打卡对象 wx_clock_log + * + * @author flossom + * @date 2024-01-29 + */ +public class WxClockLogRet extends BaseEntity { + + /** + * $column.columnComment + */ + private Long id; + + /** + * 微信用户 + */ + @Excel(name = "微信用户") + private Long userId; + + /** + * 当天使用过的仪器 + */ + @Excel(name = "当天使用过的仪器") + private String instrumentId; + + /** + * 当天使用过的仪器 + */ + @Excel(name = "当天使用过的仪器") + private String instrumentName; + + /** + * 打卡心得 + */ + @Excel(name = "打卡心得") + private String clockContent; + + private List clockImg = new ArrayList<>(); + + + public void setId(Long id) { + this.id = id; + } + + public Long getId() { + return id; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Long getUserId() { + return userId; + } + + public void setInstrumentId(String instrumentId) { + this.instrumentId = instrumentId; + } + + public String getInstrumentId() { + return instrumentId; + } + + public void setInstrumentName(String instrumentName) { + this.instrumentName = instrumentName; + } + + public String getInstrumentName() { + return instrumentName; + } + + public void setClockContent(String clockContent) { + this.clockContent = clockContent; + } + + public String getClockContent() { + return clockContent; + } + + public List getClockImg() { + return clockImg; + } + + public void setClockImg(List clockImg) { + this.clockImg = clockImg; + } +} diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockLogMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockLogMapper.java index 7740ee9..5b290d5 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockLogMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockLogMapper.java @@ -58,4 +58,6 @@ public interface WxClockLogMapper { * @return 结果 */ public int deleteWxClockLogByIds(Long[] ids); + + Integer selectCountByUserId(WxClockLog queryClockLog); } diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockLogMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockLogMapper.xml index 82bcb9e..e2dcbd1 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockLogMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockLogMapper.xml @@ -19,6 +19,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, user_id, instrument_id, instrument_name, clock_content, status, create_by, create_time from wx_clock_log + + + + + SELECT LAST_INSERT_ID() + insert into wx_clock_log user_id, diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java index 16df5c3..b38fb80 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java @@ -46,21 +46,22 @@ public class WxClockLogServiceImpl implements IWxClockLogService { WxUserMember wxUserMember = SecurityUtils.getLoginUser().getWxUserMember(); LocalDateTime now = LocalDateTime.now(); - // 首次打卡奖励 + /* 查询当天是否有打卡 */ WxClockLog queryClockLog = new WxClockLog(); queryClockLog.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); queryClockLog.getParams().put("beginTime", LocalDateTime.of(now.toLocalDate(), LocalTime.MIN)); queryClockLog.getParams().put("endTime", LocalDateTime.of(now.toLocalDate(), LocalTime.MAX)); - Integer count = wxClockLogMapper.selectCountByUserId(queryClockLog); - if (count == null || count == 0) { + List wxClockLogList = wxClockLogMapper.selectWxClockLogList(queryClockLog); + WxClockLog wxClockLog = new WxClockLog(); + if (wxClockLogList != null && wxClockLogList.size() == 1) { + // 打卡记录一天只有一条 + wxClockLog.setId(wxClockLogList.get(0).getId()); + } else { /** * TODO：当天首次打卡奖励积分 */ } - - // 打卡记录 - WxClockLog wxClockLog = new WxClockLog(); - BeanUtils.copyProperties(wxClockLogReq, wxClockLog); + wxClockLog.setClockContent(wxClockLogReq.getClockContent()); wxClockLog.setUserId(wxUserMember.getId()); wxClockLog.setCreateBy(wxUserMember.getNickname()); wxClockLog.setCreateTime(DateUtils.getNowDate()); @@ -85,10 +86,15 @@ public class WxClockLogServiceImpl implements IWxClockLogService { .collect(Collectors.joining(",")); wxClockLog.setInstrumentName(instrumentNameList); } - wxClockLogMapper.insertWxClockLog(wxClockLog); + if (wxClockLog.getId() == null) { + wxClockLogMapper.insertWxClockLog(wxClockLog); + } else { + wxClockLogMapper.updateWxClockLog(wxClockLog); + } - // 打卡图片 + /* 先删除当天的打卡图片，保存打卡图片 */ if (wxClockLogReq.getClockImageList() != null && wxClockLogReq.getClockImageList().size() > 0) { + wxClockImgMapper.deleteByUserClockId(wxClockLog.getId()); for (String image : wxClockLogReq.getClockImageList()) { WxClockImg wxClockImg = new WxClockImg(); wxClockImg.setUserClockId(wxClockLog.getId()); @@ -125,18 +131,18 @@ public class WxClockLogServiceImpl implements IWxClockLogService { List wxClockLogList = wxClockLogMapper.selectWxClockLogList(queryClockLog); if (wxClockLogList != null && wxClockLogList.size() > 0) { // 直接获取最新的打卡记录 - WxClockLog saveClockLog = new WxClockLog(); + WxClockLog updateClockLog = new WxClockLog(); WxClockLog newWxClockLog = wxClockLogList.get(0); // 获取打卡记录的使用过的仪器ID List usedList = Arrays.asList(newWxClockLog.getInstrumentId().split(",")).stream().map(Long::valueOf).collect(Collectors.toList()); if (!usedList.contains(instrumentId)) { - saveClockLog.setInstrumentId(newWxClockLog.getInstrumentId() + "," + instrumentId); + updateClockLog.setInstrumentId(newWxClockLog.getInstrumentId() + "," + instrumentId); WxInstrument instrument = wxInstrumentMapper.selectWxInstrumentById(instrumentId); if (instrument != null) { - saveClockLog.setInstrumentName(newWxClockLog.getInstrumentName() + "," + instrument.getName()); + updateClockLog.setInstrumentName(newWxClockLog.getInstrumentName() + "," + instrument.getName()); } - saveClockLog.setId(newWxClockLog.getId()); - wxClockLogMapper.updateWxClockLog(saveClockLog); + updateClockLog.setId(newWxClockLog.getId()); + wxClockLogMapper.updateWxClockLog(updateClockLog); } } } From ddbe94936355c881d87aaed4952ef997eead8b97 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Tue, 30 Jan 2024 15:49:59 +0800 Subject: [PATCH 08/30] =?UTF-8?q?=E6=8A=A4=E7=90=86=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/entity/WxNursingLog.java | 164 ++++++++++++++++ .../core/domain/req/WxNursingLogReq.java | 103 ++++++++++ .../domain/ret/WxNursingStatisticsRet.java | 49 +++++ .../core/mapper/WxNursingLogMapper.java | 61 ++++++ .../resources/mapper/WxNursingLogMapper.xml | 119 ++++++++++++ .../controller/WxNursingLogController.java | 60 ++++++ .../service/IWxNursingLogService.java | 29 +++ .../service/impl/WxNursingLogServiceImpl.java | 182 ++++++++++++++++++ 8 files changed, 767 insertions(+) create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxNursingLog.java create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxNursingLogReq.java create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxNursingStatisticsRet.java create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxNursingLogMapper.java create mode 100644 flossom-common/flossom-common-core/src/main/resources/mapper/WxNursingLogMapper.xml create mode 100644 flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxNursingLogController.java create mode 100644 flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxNursingLogService.java create mode 100644 flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxNursingLog.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxNursingLog.java new file mode 100644 index 0000000..1d1a07b --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxNursingLog.java @@ -0,0 +1,164 @@ +package com.flossom.common.core.domain.entity; + +import com.flossom.common.core.annotation.Excel; +import com.flossom.common.core.web.domain.BaseEntity; + +import java.time.LocalTime; + +/** + * 用户护理日志对象 wx_nursing_log + * + * @author flossom + * @date 2024-01-29 + */ +public class WxNursingLog extends BaseEntity { + private static final long serialVersionUID = 1L; + + private Long id; + + /** + * 用户id + */ + @Excel(name = "用户id") + private Long userId; + + /** + * 设备id + */ + @Excel(name = "设备id") + private Long instrumentId; + + /** + * 设备名称 + */ + private String instrumentName; + + /** + * 是否在线，1在线，2离线 + */ + @Excel(name = "是否在线，1在线，2离线") + private Long online; + + /** + * 模式ID + */ + @Excel(name = "模式ID") + private Long modeId; + + /** + * 模式名称 + */ + @Excel(name = "模式名称") + private String modeName; + + /** + * 护理总时长 + */ + @Excel(name = "护理总时长") + private LocalTime nursingTime; + + /** + * 完成度 + */ + private Double completionPercentage; + + /** + * 模式图片 + */ + private String modeImage; + + /** + * 状态（0正常 1停用） + */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private Long status; + + public void setId(Long id) { + this.id = id; + } + + public Long getId() { + return id; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Long getUserId() { + return userId; + } + + public void setInstrumentId(Long instrumentId) { + this.instrumentId = instrumentId; + } + + public Long getInstrumentId() { + return instrumentId; + } + + public void setOnline(Long online) { + this.online = online; + } + + public Long getOnline() { + return online; + } + + public void setModeId(Long modeId) { + this.modeId = modeId; + } + + public Long getModeId() { + return modeId; + } + + public void setModeName(String modeName) { + this.modeName = modeName; + } + + public String getModeName() { + return modeName; + } + + public void setNursingTime(LocalTime nursingTime) { + this.nursingTime = nursingTime; + } + + public LocalTime getNursingTime() { + return nursingTime; + } + + public void setStatus(Long status) { + this.status = status; + } + + public Long getStatus() { + return status; + } + + + public Double getCompletionPercentage() { + return completionPercentage; + } + + public void setCompletionPercentage(Double completionPercentage) { + this.completionPercentage = completionPercentage; + } + + public String getInstrumentName() { + return instrumentName; + } + + public void setInstrumentName(String instrumentName) { + this.instrumentName = instrumentName; + } + + public String getModeImage() { + return modeImage; + } + + public void setModeImage(String modeImage) { + this.modeImage = modeImage; + } +} diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxNursingLogReq.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxNursingLogReq.java new file mode 100644 index 0000000..d444b26 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxNursingLogReq.java @@ -0,0 +1,103 @@ +package com.flossom.common.core.domain.req; + +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 javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.time.LocalTime; + +/** + * 用户护理日志对象 wx_nursing_log + * + * @author flossom + * @date 2024-01-29 + */ +public class WxNursingLogReq { + + /** + * 设备id + */ + @NotNull(message = "请选择设备") + private Long instrumentId; + + /** + * 设备名称 + */ + @NotNull(message = "请选择设备") + private String instrumentName; + + /** + * 模式ID + */ + @NotNull(message = "请选择护理模式") + private Long modeId; + + /** + * 模式名称 + */ + @NotBlank(message = "请选择护理模式") + private String modeName; + + /** + * 护理总时长 + */ + @NotNull(message = "护理时长不能为空") + private LocalTime nursingTime; + + /** + * 完成度 + */ + private Double completionPercentage; + + + public void setInstrumentId(Long instrumentId) { + this.instrumentId = instrumentId; + } + + public Long getInstrumentId() { + return instrumentId; + } + + public void setModeId(Long modeId) { + this.modeId = modeId; + } + + public Long getModeId() { + return modeId; + } + + public void setModeName(String modeName) { + this.modeName = modeName; + } + + public String getModeName() { + return modeName; + } + + public void setNursingTime(LocalTime nursingTime) { + this.nursingTime = nursingTime; + } + + public LocalTime getNursingTime() { + return nursingTime; + } + + public String getInstrumentName() { + return instrumentName; + } + + public void setInstrumentName(String instrumentName) { + this.instrumentName = instrumentName; + } + + public Double getCompletionPercentage() { + return completionPercentage; + } + + public void setCompletionPercentage(Double completionPercentage) { + this.completionPercentage = completionPercentage; + } +} diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxNursingStatisticsRet.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxNursingStatisticsRet.java new file mode 100644 index 0000000..207fea9 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxNursingStatisticsRet.java @@ -0,0 +1,49 @@ +package com.flossom.common.core.domain.ret; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.flossom.common.core.annotation.Excel; + +import java.time.LocalTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * 当月护理记录统计信息 + */ +public class WxNursingStatisticsRet { + + /** + * 当月护理天数 + */ + private Integer nursingNum; + + /** + * 当月护理时长 + */ + private LocalTime nursingTime; + + public WxNursingStatisticsRet() { + } + + public WxNursingStatisticsRet(Integer nursingNum, LocalTime nursingTime) { + this.nursingNum = nursingNum; + this.nursingTime = nursingTime; + } + + public Integer getNursingNum() { + return nursingNum; + } + + public void setNursingNum(Integer nursingNum) { + this.nursingNum = nursingNum; + } + + public LocalTime getNursingTime() { + return nursingTime; + } + + public void setNursingTime(LocalTime nursingTime) { + this.nursingTime = nursingTime; + } +} diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxNursingLogMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxNursingLogMapper.java new file mode 100644 index 0000000..968d90b --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxNursingLogMapper.java @@ -0,0 +1,61 @@ +package com.flossom.common.core.mapper; + +import com.flossom.common.core.domain.entity.WxNursingLog; + +import java.util.List; + +/** + * 用户护理日志Mapper接口 + * + * @author flossom + * @date 2024-01-29 + */ +public interface WxNursingLogMapper { + /** + * 查询用户护理日志 + * + * @param id 用户护理日志主键 + * @return 用户护理日志 + */ + public WxNursingLog selectWxNursingLogById(Long id); + + /** + * 查询用户护理日志列表 + * + * @param wxNursingLog 用户护理日志 + * @return 用户护理日志集合 + */ + public List selectWxNursingLogList(WxNursingLog wxNursingLog); + + /** + * 新增用户护理日志 + * + * @param wxNursingLog 用户护理日志 + * @return 结果 + */ + public int insertWxNursingLog(WxNursingLog wxNursingLog); + + /** + * 修改用户护理日志 + * + * @param wxNursingLog 用户护理日志 + * @return 结果 + */ + public int updateWxNursingLog(WxNursingLog wxNursingLog); + + /** + * 删除用户护理日志 + * + * @param id 用户护理日志主键 + * @return 结果 + */ + public int deleteWxNursingLogById(Long id); + + /** + * 批量删除用户护理日志 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWxNursingLogByIds(Long[] ids); +} diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxNursingLogMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxNursingLogMapper.xml new file mode 100644 index 0000000..118b7b9 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxNursingLogMapper.xml @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + select id, user_id, instrument_id, instrument_name, online, mode_id, mode_name, nursing_time, completion_percentage, status, create_by, create_time, update_by, update_time from wx_nursing_log + + + + + + + + insert into wx_nursing_log + + user_id, + instrument_id, + instrument_name, + online, + mode_id, + mode_name, + nursing_time, + completion_percentage, + status, + create_by, + create_time, + update_by, + update_time, + + + #{userId}, + #{instrumentId}, + #{instrumentName}, + #{online}, + #{modeId}, + #{modeName}, + #{nursingTime}, + #{completionPercentage}, + #{status}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update wx_nursing_log + + user_id = #{userId}, + instrument_id = #{instrumentId}, + instrument_name = #{instrumentName}, + online = #{online}, + mode_id = #{modeId}, + mode_name = #{modeName}, + nursing_time = #{nursingTime}, + completion_percentage = #{completionPercentage}, + status = #{status}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from wx_nursing_log where id = #{id} + + + + delete from wx_nursing_log where id in + + #{id} + + + \ No newline at end of file diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxNursingLogController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxNursingLogController.java new file mode 100644 index 0000000..6823100 --- /dev/null +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxNursingLogController.java @@ -0,0 +1,60 @@ +package com.flossom.miniProgram.controller; + +import java.util.List; + +import com.flossom.common.core.domain.R; +import com.flossom.common.core.domain.entity.WxNursingLog; +import com.flossom.common.core.domain.req.WxNursingLogReq; +import com.flossom.common.core.web.controller.BaseController; +import com.flossom.common.core.web.domain.AjaxResult; +import com.flossom.common.core.web.page.TableDataInfo; +import com.flossom.miniProgram.service.IWxNursingLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import javax.validation.constraints.NotNull; + +/** + * 用户护理日志Controller + * + * @author flossom + * @date 2024-01-29 + */ +@RestController +@RequestMapping("/nursingLog") +public class WxNursingLogController extends BaseController { + + @Autowired + private IWxNursingLogService wxNursingLogService; + + /** + * 查询用户护理记录 + */ + @GetMapping("/record") + public TableDataInfo record(@NotNull(message = "请选择仪器") + @RequestParam(value = "instrumentId", required = false) Long instrumentId) { + startPage(); + List list = wxNursingLogService.selectWxNursingLogList(instrumentId); + return getDataTable(list); + } + + /** + * 查询用户护理记录的当月统计信息 + */ + @GetMapping("/statistics") + public R statistics(@NotNull(message = "请选择仪器") @RequestParam(value = "instrumentId") Long instrumentId) { + return R.ok(wxNursingLogService.statistics(instrumentId)); + } + + + /** + * 新增用户护理日志 + */ + @PostMapping("/add") + public R add(@Validated @RequestBody WxNursingLogReq wxNursingLogReq) { + wxNursingLogService.insertWxNursingLog(wxNursingLogReq); + return R.ok(); + } +} diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxNursingLogService.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxNursingLogService.java new file mode 100644 index 0000000..9f0cbab --- /dev/null +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxNursingLogService.java @@ -0,0 +1,29 @@ +package com.flossom.miniProgram.service; + +import com.flossom.common.core.domain.entity.WxNursingLog; +import com.flossom.common.core.domain.req.WxNursingLogReq; +import com.flossom.common.core.domain.ret.WxNursingStatisticsRet; + +import java.util.List; + + +/** + * 用户护理日志Service接口 + * + * @author flossom + * @date 2024-01-29 + */ +public interface IWxNursingLogService { + + /** + * 查询用户护理日志列表 + */ + public List selectWxNursingLogList(Long instrumentId); + + /** + * 新增用户护理日志 + */ + public void insertWxNursingLog(WxNursingLogReq wxNursingLogReq); + + WxNursingStatisticsRet statistics(Long instrumentId); +} diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java new file mode 100644 index 0000000..2e34196 --- /dev/null +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java @@ -0,0 +1,182 @@ +package com.flossom.miniProgram.service.impl; + +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.temporal.TemporalAdjusters; +import java.util.List; + +import com.flossom.common.core.domain.entity.*; +import com.flossom.common.core.domain.req.WxNursingLogReq; +import com.flossom.common.core.domain.ret.WxNursingStatisticsRet; +import com.flossom.common.core.enums.Status; +import com.flossom.common.core.exception.ServiceException; +import com.flossom.common.core.mapper.WxInstrumentMapper; +import com.flossom.common.core.mapper.WxModeMapper; +import com.flossom.common.core.mapper.WxNursingLogMapper; +import com.flossom.common.core.utils.DateUtils; +import com.flossom.common.core.utils.StringUtils; +import com.flossom.common.security.utils.DictUtils; +import com.flossom.common.security.utils.SecurityUtils; +import com.flossom.miniProgram.service.IWxNursingLogService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * 用户护理日志Service业务层处理 + * + * @author flossom + * @date 2024-01-29 + */ +@Service +public class WxNursingLogServiceImpl implements IWxNursingLogService { + + @Autowired + private WxNursingLogMapper wxNursingLogMapper; + + @Autowired + private WxInstrumentMapper wxInstrumentMapper; + + @Autowired + private WxModeMapper wxModeMapper; + + @Override + public WxNursingStatisticsRet statistics(Long instrumentId) { + // 排序：最新的护理记录在最上方；图片由后台模式管理-模式封面图片进行配置； + WxNursingLog queryNursingLog = new WxNursingLog(); + queryNursingLog.setInstrumentId(instrumentId); + LocalDateTime now = LocalDateTime.now(); + queryNursingLog.getParams().put("beginTime", now.with(TemporalAdjusters.firstDayOfMonth()).with(LocalTime.MIN)); + queryNursingLog.getParams().put("endTime", now.with(TemporalAdjusters.lastDayOfMonth()).with(LocalTime.MAX)); + List wxNursingLogList = wxNursingLogMapper.selectWxNursingLogList(queryNursingLog); + if (wxNursingLogList != null) { + WxNursingStatisticsRet wxNursingStatisticsRet = new WxNursingStatisticsRet(); + wxNursingStatisticsRet.setNursingNum(wxNursingLogList.size()); + Integer totalNursingSecond = 0; + if (wxNursingLogList.size() > 0) { + for (WxNursingLog wxNursingLog : wxNursingLogList) { + if (wxNursingLog.getNursingTime() != null) { + totalNursingSecond += wxNursingLog.getNursingTime().toSecondOfDay(); + } + } + + } + wxNursingStatisticsRet.setNursingTime(LocalTime.ofSecondOfDay(totalNursingSecond)); + return wxNursingStatisticsRet; + } + return new WxNursingStatisticsRet(0, LocalTime.ofSecondOfDay(0)); + } + + /** + * 查询用户护理日志列表 + */ + @Override + public List selectWxNursingLogList(Long instrumentId) { + // 排序：最新的护理记录在最上方；图片由后台模式管理-模式封面图片进行配置； + WxNursingLog wxNursingLog = new WxNursingLog(); + wxNursingLog.setInstrumentId(instrumentId); + List wxNursingLogList = wxNursingLogMapper.selectWxNursingLogList(wxNursingLog); + if (wxNursingLogList != null && wxNursingLogList.size() > 0) { + for (WxNursingLog nursingLog : wxNursingLogList) { + WxMode wxMode = wxModeMapper.selectWxModeById(nursingLog.getModeId()); + if (wxMode != null) { + nursingLog.setModeImage(wxMode.getModeBanner()); + } + } + } + return wxNursingLogList; + } + + /** + * 新增用户护理日志 + */ + @Override + public void insertWxNursingLog(WxNursingLogReq wxNursingLogReq) { + /* 查询 同一仪器，同一模式 下，是否有相同的记录，如果有合并护理时间 */ + WxInstrument wxInstrument = wxInstrumentMapper.selectWxInstrumentById(wxNursingLogReq.getInstrumentId()); + if (wxInstrument == null) { + throw new ServiceException("保存失败"); + } + WxNursingLog queryNursingLog = new WxNursingLog(); + queryNursingLog.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); + queryNursingLog.setInstrumentId(wxNursingLogReq.getInstrumentId()); + LocalDateTime now = LocalDateTime.now(); + queryNursingLog.getParams().put("beginTime", LocalDateTime.of(now.toLocalDate(), LocalTime.MIN)); + queryNursingLog.getParams().put("endTime", LocalDateTime.of(now.toLocalDate(), LocalTime.MAX)); + List wxNursingLogList = wxNursingLogMapper.selectWxNursingLogList(queryNursingLog); + + if (wxNursingLogList != null && wxNursingLogList.size() > 0) { + // 存在，修改 + WxNursingLog updateNursingLog = new WxNursingLog(); + WxNursingLog wxNursingLog = wxNursingLogList.get(0); + // 非IOT仪器没有护理时间 + if (wxNursingLog.getNursingTime() != null) { + if (wxNursingLogReq.getNursingTime() != null) { + updateNursingLog.setNursingTime(wxNursingLog.getNursingTime().plusSeconds(wxNursingLogReq.getNursingTime().toSecondOfDay())); + } + } else { + updateNursingLog.setNursingTime(wxNursingLogReq.getNursingTime()); + } + LocalTime nursingTime = wxInstrument.getNursingTime(); + if (nursingTime != null) { + Integer userNursingTime = updateNursingLog.getNursingTime().toSecondOfDay(); + Integer instrumentNursingTime = nursingTime.toSecondOfDay(); + if (userNursingTime != null && userNursingTime > instrumentNursingTime) { + updateNursingLog.setCompletionPercentage(1.0); + } else { + if (instrumentNursingTime != null && instrumentNursingTime != 0) { + updateNursingLog.setCompletionPercentage(Double.valueOf(userNursingTime) / instrumentNursingTime); + } + } + } + updateNursingLog.setId(wxNursingLog.getId()); + updateNursingLog.setUpdateBy(SecurityUtils.getLoginUser().getWxUserMember().getNickname()); + updateNursingLog.setUpdateTime(DateUtils.getNowDate()); + wxNursingLogMapper.updateWxNursingLog(updateNursingLog); + } else { + // 不存在，新增 + WxNursingLog wxNursingLog = new WxNursingLog(); + BeanUtils.copyProperties(wxNursingLogReq, wxNursingLog); + wxNursingLog.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); + // 非IOT仪器没有护理时间 + LocalTime nursingTime = wxInstrument.getNursingTime(); + if (nursingTime != null) { + Integer instrumentNursingTime = nursingTime.toSecondOfDay(); + Integer userNursingTime = wxNursingLog.getNursingTime().toSecondOfDay(); + if (instrumentNursingTime != null && instrumentNursingTime != 0) { + wxNursingLog.setCompletionPercentage(Double.valueOf(userNursingTime) / instrumentNursingTime); + } + } + // 离线状态/在线状态 + Boolean online = true; + List nursingOfflineInstrumentModelDict = DictUtils.getDictCache("nursing_offline_instrument_model"); + if (nursingOfflineInstrumentModelDict != null && nursingOfflineInstrumentModelDict.size() > 0) { + for (SysDictData sysDictData : nursingOfflineInstrumentModelDict) { + if (StringUtils.equals(sysDictData.getDictType(), wxInstrument.getModel())) { + List nursingOfflineInstrumentModeDict = DictUtils.getDictCache("nursing_offline_instrument_mode"); + if (nursingOfflineInstrumentModeDict != null && nursingOfflineInstrumentModeDict.size() > 0) { + for (SysDictData dictData : nursingOfflineInstrumentModeDict) { + if (StringUtils.equals(dictData.getDictType(), wxNursingLogReq.getModeName())) { + // 离线 + online = false; + wxNursingLog.setOnline(2L); + } + } + } + } + } + } + if (online) { + // 在线 + wxNursingLog.setOnline(1L); + } + wxNursingLog.setCreateBy(SecurityUtils.getLoginUser().getWxUserMember().getNickname()); + wxNursingLog.setCreateTime(DateUtils.getNowDate()); + wxNursingLog.setUpdateBy(SecurityUtils.getLoginUser().getWxUserMember().getNickname()); + wxNursingLog.setUpdateTime(DateUtils.getNowDate()); + wxNursingLog.setStatus(Status.OK.getCode().longValue()); + wxNursingLogMapper.insertWxNursingLog(wxNursingLog); + } + } + +} From 3f2a9fe314b542232f91ef35bb69d3f0af3a1855 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Tue, 30 Jan 2024 16:22:04 +0800 Subject: [PATCH 09/30] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E6=89=93?= =?UTF-8?q?=E5=8D=A1=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/mapper/WxClockLogMapper.java | 3 ++ .../resources/mapper/WxClockLogMapper.xml | 31 ++++++++++++++++++- .../controller/WxClockLogController.java | 23 +++++++++++--- .../service/IWxClockLogService.java | 7 ++++- .../service/impl/WxClockLogServiceImpl.java | 22 +++++++++++-- 5 files changed, 78 insertions(+), 8 deletions(-) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockLogMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockLogMapper.java index 5b290d5..8806fab 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockLogMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockLogMapper.java @@ -1,6 +1,7 @@ package com.flossom.common.core.mapper; import com.flossom.common.core.domain.entity.WxClockLog; +import com.flossom.common.core.domain.ret.WxClockLogRet; import java.util.List; @@ -60,4 +61,6 @@ public interface WxClockLogMapper { public int deleteWxClockLogByIds(Long[] ids); Integer selectCountByUserId(WxClockLog queryClockLog); + + List selectWxClockImgRetList(WxClockLog queryClockLog); } diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockLogMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockLogMapper.xml index 1477ce2..9bcb998 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockLogMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockLogMapper.xml @@ -15,6 +15,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + select id, user_id, instrument_id, instrument_name, clock_content, status, create_by, create_time from wx_clock_log @@ -49,7 +59,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + + + + SELECT LAST_INSERT_ID() diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java index e68f45a..4f3ff30 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java @@ -3,9 +3,13 @@ package com.flossom.miniProgram.controller; import com.flossom.common.core.constant.Constants; import com.flossom.common.core.domain.R; import com.flossom.common.core.domain.SysFile; +import com.flossom.common.core.domain.entity.WxClockLog; +import com.flossom.common.core.domain.entity.WxNursingLog; import com.flossom.common.core.domain.req.WxClockLogReq; +import com.flossom.common.core.domain.ret.WxClockLogRet; import com.flossom.common.core.exception.ServiceException; import com.flossom.common.core.web.controller.BaseController; +import com.flossom.common.core.web.page.TableDataInfo; import com.flossom.miniProgram.service.IWxClockLogService; import com.flossom.system.api.RemoteFileService; import org.apache.commons.lang3.StringUtils; @@ -16,6 +20,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.validation.constraints.NotNull; import java.util.ArrayList; +import java.util.List; /** * 用户打卡Controller @@ -43,11 +48,21 @@ public class WxClockLogController extends BaseController { } /** - * 获取用户打卡 + * 获取用户当天最新的一条打卡记录 */ - @GetMapping("/getClockByUserId") - public R getClockByUserId() { - return R.ok(wxClockLogService.getClockByUserId()); + @GetMapping("/latestClockRecord") + public R latestClockRecord() { + return R.ok(wxClockLogService.latestClockRecord()); + } + + /** + * 分页查询用户的打卡记录 + */ + @GetMapping("/list") + public TableDataInfo list() { + startPage(); + List list = wxClockLogService.selectWxClockLogList(); + return getDataTable(list); } /** diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxClockLogService.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxClockLogService.java index 6af23a4..b006e01 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxClockLogService.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxClockLogService.java @@ -1,14 +1,19 @@ package com.flossom.miniProgram.service; +import com.flossom.common.core.domain.entity.WxClockLog; import com.flossom.common.core.domain.req.WxClockLogReq; import com.flossom.common.core.domain.ret.WxClockLogRet; +import java.util.List; + public interface IWxClockLogService { public void insertWxClockLog(WxClockLogReq wxClockLogReq); void addClockInstrument(Long instrumentId); - WxClockLogRet getClockByUserId(); + WxClockLogRet latestClockRecord(); + + List selectWxClockLogList(); } diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java index b38fb80..d3e99f0 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java @@ -148,8 +148,7 @@ public class WxClockLogServiceImpl implements IWxClockLogService { } @Override - public WxClockLogRet getClockByUserId() { - // 查询今天是否有打卡，存在打卡，则将仪器添加到最近一条打卡记录上 + public WxClockLogRet latestClockRecord() { WxClockLog queryClockLog = new WxClockLog(); queryClockLog.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); LocalDateTime now = LocalDateTime.now(); @@ -172,4 +171,23 @@ public class WxClockLogServiceImpl implements IWxClockLogService { } return wxClockLogRet; } + + @Override + public List selectWxClockLogList() { + WxClockLog queryClockLog = new WxClockLog(); + queryClockLog.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); + List list = wxClockLogMapper.selectWxClockImgRetList(queryClockLog); + if (list != null && list.size() > 0) { + for (WxClockLogRet wxClockLogRet : list) { + WxClockImg wxClockImg = new WxClockImg(); + wxClockImg.setUserClockId(wxClockLogRet.getId()); + List wxClockImgs = wxClockImgMapper.selectWxClockImgList(wxClockImg); + if (wxClockImgs!=null && wxClockImgs.size()>0) { + List collect = wxClockImgs.stream().map(WxClockImg::getClockImg).collect(Collectors.toList()); + wxClockLogRet.setClockImg(collect); + } + } + } + return list; + } } From 739fa50013ab9bd3d7460fc12fb51f3ab810ecc5 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Tue, 30 Jan 2024 17:33:57 +0800 Subject: [PATCH 10/30] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BB=AA=E5=99=A8ID?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=91=E5=AE=9A=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/ret/WxBindingInstrumentInfo.java | 223 ++++++++++++++++++ .../controller/WxInstrumentController.java | 8 + .../service/IWxInstrumentService.java | 3 + .../service/impl/WxInstrumentServiceImpl.java | 39 +++ 4 files changed, 273 insertions(+) create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxBindingInstrumentInfo.java diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxBindingInstrumentInfo.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxBindingInstrumentInfo.java new file mode 100644 index 0000000..1199402 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxBindingInstrumentInfo.java @@ -0,0 +1,223 @@ +package com.flossom.common.core.domain.ret; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.flossom.common.core.web.domain.BaseEntity; + +import java.time.LocalTime; +import java.util.Date; + +/** + * 用户绑定仪器信息 + */ +public class WxBindingInstrumentInfo extends BaseEntity { + + /** + * 仪器ID + */ + private Long instrumentId; + + /** + * 仪器名称 + */ + private String instrumentName; + + /** + * 仪器：1、普通仪器 2、iot仪器 + */ + private Integer instrumentType; + + /** + * iot仪器特有：仪器型号 + */ + private String instrumentModel; + + /** + * 仪器封面（图片地址） + */ + private String instrumentBanner; + + /** + * 仪器logo图（图片地址） + */ + private String instrumentLogo; + + /** + * 序列号位置图片（图片地址） + */ + private String instrumentSerialImageLocation; + + /** + * 序列号 + */ + private String bindingSerial; + + + /** + * 序列号图片 + */ + private String bindingSerialImage; + /** + * 保修日期 + */ + private Long instrumentGuarantee; + + + /** + * 护理时长 + */ + @JsonFormat(pattern = "HH:mm:ss") + private LocalTime instrumentNursingTime; + + /** + * iot版本 + */ + private String instrumentIotVersion; + + /** + * iot升级数据文件 + */ + private String instrumentIotUpgradeData; + + /** + * 是否开启扫机身码：0、关闭 1、开启 + */ + private Integer instrumentIsScanCode; + + /** + * 是否支持购买：0、不支持 1、支持 + */ + private Integer instrumentIsPurchase; + + /** + * 绑定时间 + */ + private Date bindingDateTime; + + public Long getInstrumentId() { + return instrumentId; + } + + public void setInstrumentId(Long instrumentId) { + this.instrumentId = instrumentId; + } + + public String getInstrumentName() { + return instrumentName; + } + + public void setInstrumentName(String instrumentName) { + this.instrumentName = instrumentName; + } + + public Integer getInstrumentType() { + return instrumentType; + } + + public void setInstrumentType(Integer instrumentType) { + this.instrumentType = instrumentType; + } + + public String getInstrumentModel() { + return instrumentModel; + } + + public void setInstrumentModel(String instrumentModel) { + this.instrumentModel = instrumentModel; + } + + public String getInstrumentBanner() { + return instrumentBanner; + } + + public void setInstrumentBanner(String instrumentBanner) { + this.instrumentBanner = instrumentBanner; + } + + public String getInstrumentLogo() { + return instrumentLogo; + } + + public void setInstrumentLogo(String instrumentLogo) { + this.instrumentLogo = instrumentLogo; + } + + public String getInstrumentSerialImageLocation() { + return instrumentSerialImageLocation; + } + + public void setInstrumentSerialImageLocation(String instrumentSerialImageLocation) { + this.instrumentSerialImageLocation = instrumentSerialImageLocation; + } + + public String getBindingSerial() { + return bindingSerial; + } + + public void setBindingSerial(String bindingSerial) { + this.bindingSerial = bindingSerial; + } + + public String getBindingSerialImage() { + return bindingSerialImage; + } + + public void setBindingSerialImage(String bindingSerialImage) { + this.bindingSerialImage = bindingSerialImage; + } + + public Long getInstrumentGuarantee() { + return instrumentGuarantee; + } + + public void setInstrumentGuarantee(Long instrumentGuarantee) { + this.instrumentGuarantee = instrumentGuarantee; + } + + public LocalTime getInstrumentNursingTime() { + return instrumentNursingTime; + } + + public void setInstrumentNursingTime(LocalTime instrumentNursingTime) { + this.instrumentNursingTime = instrumentNursingTime; + } + + public String getInstrumentIotVersion() { + return instrumentIotVersion; + } + + public void setInstrumentIotVersion(String instrumentIotVersion) { + this.instrumentIotVersion = instrumentIotVersion; + } + + public String getInstrumentIotUpgradeData() { + return instrumentIotUpgradeData; + } + + public void setInstrumentIotUpgradeData(String instrumentIotUpgradeData) { + this.instrumentIotUpgradeData = instrumentIotUpgradeData; + } + + public Integer getInstrumentIsScanCode() { + return instrumentIsScanCode; + } + + public void setInstrumentIsScanCode(Integer instrumentIsScanCode) { + this.instrumentIsScanCode = instrumentIsScanCode; + } + + public Integer getInstrumentIsPurchase() { + return instrumentIsPurchase; + } + + public void setInstrumentIsPurchase(Integer instrumentIsPurchase) { + this.instrumentIsPurchase = instrumentIsPurchase; + } + + public Date getBindingDateTime() { + return bindingDateTime; + } + + public void setBindingDateTime(Date bindingDateTime) { + this.bindingDateTime = bindingDateTime; + } +} diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxInstrumentController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxInstrumentController.java index c157759..1e6ef3f 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxInstrumentController.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxInstrumentController.java @@ -148,4 +148,12 @@ public class WxInstrumentController extends BaseController { return R.ok(wxInstrumentService.upgrade(instrumentId)); } + /** + * 根据仪器ID获取绑定记录 + */ + @GetMapping(value = "/bindingInstrumentInfo") + public R bindingInstrumentInfo(@NotBlank(message = "仪器ID不能为空") @RequestParam("instrumentId") Long instrumentId) { + return R.ok(wxInstrumentService.bindingInstrumentInfo(instrumentId)); + } + } diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxInstrumentService.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxInstrumentService.java index a31806c..01b847b 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxInstrumentService.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxInstrumentService.java @@ -1,6 +1,7 @@ package com.flossom.miniProgram.service; import com.flossom.common.core.domain.entity.*; +import com.flossom.common.core.domain.ret.WxBindingInstrumentInfo; import com.flossom.common.core.domain.ret.WxModeRet; import java.util.List; @@ -29,4 +30,6 @@ public interface IWxInstrumentService { WxInstrumentSerial determineSerialIsSameInstrument(String serial, Long instrumentId); String upgrade(Long instrumentId); + + WxBindingInstrumentInfo bindingInstrumentInfo(Long instrumentId); } diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java index ef1bd4e..d8504d1 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java @@ -1,7 +1,9 @@ package com.flossom.miniProgram.service.impl; import com.alibaba.nacos.common.utils.CollectionUtils; +import com.fasterxml.jackson.annotation.JsonFormat; import com.flossom.common.core.domain.entity.*; +import com.flossom.common.core.domain.ret.WxBindingInstrumentInfo; import com.flossom.common.core.domain.ret.WxModeRet; import com.flossom.common.core.enums.*; import com.flossom.common.core.exception.ServiceException; @@ -24,6 +26,7 @@ import java.io.*; import java.net.URL; import java.time.Instant; import java.time.LocalDateTime; +import java.time.LocalTime; import java.time.ZoneId; import java.util.ArrayList; import java.util.Date; @@ -233,6 +236,8 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { wxUserInstrumentLog.setStatus(Status.OK.getCode().longValue()); wxUserInstrumentLog.setCreateBy(wxUserMember.getNickname()); wxUserInstrumentLog.setCreateTime(DateUtils.getNowDate()); + wxUserInstrumentLog.setUpdateBy(wxUserMember.getNickname()); + wxUserInstrumentLog.setUpdateTime(DateUtils.getNowDate()); wxUserInstrumentLogMapper.insertWxUserInstrumentLog(wxUserInstrumentLog); // 会员信息中的仪器数量加1 @@ -437,4 +442,38 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { } return null; } + + @Override + public WxBindingInstrumentInfo bindingInstrumentInfo(Long instrumentId) { + WxUserMember wxUserMember = SecurityUtils.getLoginUser().getWxUserMember(); + WxUserInstrument query = new WxUserInstrument(); + query.setUserId(wxUserMember.getId()); + query.setInstrumentId(instrumentId); + query.setBindingStatus(BindingStatusEnums.BINDED.getCode()); + List wxUserInstrumentList = wxUserInstrumentMapper.selectListByUserIdAndInstrumentId(query); + if (wxUserInstrumentList == null || wxUserInstrumentList.size() != 0) { + throw new ServiceException("没有绑定该仪器"); + } + WxUserInstrument wxUserInstrument = wxUserInstrumentList.get(0); + WxInstrument wxInstrument = wxInstrumentMapper.selectWxInstrumentById(instrumentId); + // 封装返回信息 + WxBindingInstrumentInfo wxBindingInstrumentInfo = new WxBindingInstrumentInfo(); + wxBindingInstrumentInfo.setInstrumentId(wxInstrument.getId()); + wxBindingInstrumentInfo.setInstrumentName(wxInstrument.getName()); + wxBindingInstrumentInfo.setInstrumentType(wxInstrument.getType()); + wxBindingInstrumentInfo.setInstrumentModel(wxInstrument.getModel()); + wxBindingInstrumentInfo.setInstrumentBanner(wxInstrument.getBanner()); + wxBindingInstrumentInfo.setInstrumentLogo(wxInstrument.getLogo()); + wxBindingInstrumentInfo.setInstrumentSerialImageLocation(wxInstrument.getSerial()); + wxBindingInstrumentInfo.setBindingSerial(wxUserInstrument.getSerial()); + wxBindingInstrumentInfo.setBindingSerialImage(wxUserInstrument.getSerialImage()); + wxBindingInstrumentInfo.setInstrumentGuarantee(wxUserInstrument.getGuarantee()); + wxBindingInstrumentInfo.setInstrumentNursingTime(wxInstrument.getNursingTime()); + wxBindingInstrumentInfo.setInstrumentIotVersion(wxInstrument.getIotVersion()); + wxBindingInstrumentInfo.setInstrumentIotUpgradeData(wxInstrument.getIotUpgradeData()); + wxBindingInstrumentInfo.setInstrumentIsScanCode(wxInstrument.getIsScanCode()); + wxBindingInstrumentInfo.setInstrumentIsPurchase(wxInstrument.getIsPurchase()); + wxBindingInstrumentInfo.setBindingDateTime(wxUserInstrument.getUpdateTime()); + return wxBindingInstrumentInfo; + } } From c2e9c04a6216e4236281157e67b0d0dcb4aba57e Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Tue, 30 Jan 2024 17:56:18 +0800 Subject: [PATCH 11/30] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=8A=A4=E7=90=86=E8=AE=B0=E5=BD=95=E7=9A=84=E5=BD=93=E6=9C=88?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxNursingLogServiceImpl.java | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java index 2e34196..5a94c35 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java @@ -1,9 +1,13 @@ package com.flossom.miniProgram.service.impl; +import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; +import java.time.ZoneId; import java.time.temporal.TemporalAdjusters; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; import com.flossom.common.core.domain.entity.*; import com.flossom.common.core.domain.req.WxNursingLogReq; @@ -49,17 +53,20 @@ public class WxNursingLogServiceImpl implements IWxNursingLogService { queryNursingLog.getParams().put("beginTime", now.with(TemporalAdjusters.firstDayOfMonth()).with(LocalTime.MIN)); queryNursingLog.getParams().put("endTime", now.with(TemporalAdjusters.lastDayOfMonth()).with(LocalTime.MAX)); List wxNursingLogList = wxNursingLogMapper.selectWxNursingLogList(queryNursingLog); - if (wxNursingLogList != null) { + if (wxNursingLogList != null && wxNursingLogList.size() > 0) { WxNursingStatisticsRet wxNursingStatisticsRet = new WxNursingStatisticsRet(); - wxNursingStatisticsRet.setNursingNum(wxNursingLogList.size()); + Map collect = wxNursingLogList.stream().collect( + Collectors.groupingBy( + log -> log.getCreateTime().toInstant() + .atZone(ZoneId.systemDefault()).toLocalDate(), Collectors.counting() + ) + ); + wxNursingStatisticsRet.setNursingNum(collect.size()); Integer totalNursingSecond = 0; - if (wxNursingLogList.size() > 0) { - for (WxNursingLog wxNursingLog : wxNursingLogList) { - if (wxNursingLog.getNursingTime() != null) { - totalNursingSecond += wxNursingLog.getNursingTime().toSecondOfDay(); - } + for (WxNursingLog wxNursingLog : wxNursingLogList) { + if (wxNursingLog.getNursingTime() != null) { + totalNursingSecond += wxNursingLog.getNursingTime().toSecondOfDay(); } - } wxNursingStatisticsRet.setNursingTime(LocalTime.ofSecondOfDay(totalNursingSecond)); return wxNursingStatisticsRet; From 4d68f01931cc48e59e18722582731fc5ee6f4807 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Tue, 30 Jan 2024 19:54:00 +0800 Subject: [PATCH 12/30] =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8F=B7=E4=B8=8E=E4=BB=AA=E5=99=A8=E6=98=AF=E5=90=A6=E5=AF=B9?= =?UTF-8?q?=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../miniProgram/service/impl/WxInstrumentServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java index d8504d1..86dd0db 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java @@ -417,7 +417,7 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { public WxInstrumentSerial determineSerialIsSameInstrument(String serial, Long instrumentId) { /* 1、获取序列号信息 */ WxInstrumentSerial wxInstrumentSerial = getInstrumentInfoBySerial(serial); - if (wxInstrumentSerial.getInstrumentId() == instrumentId) { + if (wxInstrumentSerial.getInstrumentId() != instrumentId) { logger.info("用户选择的仪器与序列号对应的仪器不一致，序列号：{}， 仪器ID：{}", serial, instrumentId); throw new ServiceReturnCodeException("用户选择的仪器与序列号对应的仪器不一致", 204); } From 635604220a6803e098e1d3416acf90c2aad7659b Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Wed, 31 Jan 2024 10:45:05 +0800 Subject: [PATCH 13/30] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../miniProgram/service/impl/WxInstrumentServiceImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java index 86dd0db..263b0c7 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java @@ -1,7 +1,5 @@ package com.flossom.miniProgram.service.impl; -import com.alibaba.nacos.common.utils.CollectionUtils; -import com.fasterxml.jackson.annotation.JsonFormat; import com.flossom.common.core.domain.entity.*; import com.flossom.common.core.domain.ret.WxBindingInstrumentInfo; import com.flossom.common.core.domain.ret.WxModeRet; @@ -451,7 +449,7 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { query.setInstrumentId(instrumentId); query.setBindingStatus(BindingStatusEnums.BINDED.getCode()); List wxUserInstrumentList = wxUserInstrumentMapper.selectListByUserIdAndInstrumentId(query); - if (wxUserInstrumentList == null || wxUserInstrumentList.size() != 0) { + if (wxUserInstrumentList == null || wxUserInstrumentList.size() != 1) { throw new ServiceException("没有绑定该仪器"); } WxUserInstrument wxUserInstrument = wxUserInstrumentList.get(0); From 07dc468c118c6eab60dd4ecd04b3b8d395335466 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Wed, 31 Jan 2024 11:39:24 +0800 Subject: [PATCH 14/30] =?UTF-8?q?=E8=A7=A3=E7=BB=91=E4=BB=AA=E5=99=A8?= =?UTF-8?q?=E4=B9=9F=E8=A6=81=E8=A7=A3=E7=BB=91=E5=BA=8F=E5=88=97=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxUserInstrumentServiceImpl.java | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserInstrumentServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserInstrumentServiceImpl.java index 831b356..27912f0 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserInstrumentServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserInstrumentServiceImpl.java @@ -6,10 +6,7 @@ import java.util.*; import java.util.stream.Collectors; import com.alibaba.nacos.shaded.com.google.common.collect.Maps; -import com.flossom.common.core.domain.entity.WxInstrumentSerial; -import com.flossom.common.core.domain.entity.WxUserInstrument; -import com.flossom.common.core.domain.entity.WxUserInstrumentLog; -import com.flossom.common.core.domain.entity.WxUserMember; +import com.flossom.common.core.domain.entity.*; import com.flossom.common.core.domain.req.WxUserInstrumentExportVm; import com.flossom.common.core.enums.BindingStatusEnums; import com.flossom.common.core.mapper.*; @@ -40,6 +37,7 @@ public class WxUserInstrumentServiceImpl implements IWxUserInstrumentService private WxInstrumentMapper wxInstrumentMapper; @Autowired private WxInstrumentSerialMapper instrumentSerialMapper; + private WxInstrumentSerialLogMapper instrumentSerialLogMapper; @Autowired private WxUserInstrumentLogMapper wxUserInstrumentLogMapper; @@ -157,6 +155,23 @@ public class WxUserInstrumentServiceImpl implements IWxUserInstrumentService // 更新处理 userMember.setDevicesNum(devicesNum); wxUserMemberMapper.updateWxUserMember(userMember); + + // 更新序列号绑定状态为解绑 + WxInstrumentSerial update = new WxInstrumentSerial(); + update.setSerial(userInstrument.getSerial()); + update.setBindingStatus(BindingStatusEnums.UN_BOUND.getCode()); + instrumentSerialMapper.updateBySerial(update); + // 保存序列号解绑记录 + WxInstrumentSerialLog wxInstrumentSerialLog = new WxInstrumentSerialLog(); + wxInstrumentSerialLog.setUserId(userMember.getId()); + wxInstrumentSerialLog.setUserName(userMember.getNickname()); + wxInstrumentSerialLog.setUserMobile(userMember.getMobile()); + wxInstrumentSerialLog.setUserHeadimg(userMember.getHeadimg()); + wxInstrumentSerialLog.setInstrumentId(userInstrument.getInstrumentId()); + wxInstrumentSerialLog.setInstrumentName(userInstrument.getInstrumentName()); + wxInstrumentSerialLog.setSerial(userInstrument.getSerial()); + wxInstrumentSerialLog.setBindingStatus(BindingStatusEnums.UN_BOUND.getCode()); + instrumentSerialLogMapper.insertWxInstrumentSerialLog(wxInstrumentSerialLog); } } } From b8a8d1962a3d084041b68de3f70a80ce16ab4a77 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Wed, 31 Jan 2024 16:02:47 +0800 Subject: [PATCH 15/30] =?UTF-8?q?=E6=89=93=E5=8D=A1=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/entity/WxClockStatistics.java | 116 ++++++++++++++++ .../core/mapper/WxClockStatisticsMapper.java | 65 +++++++++ .../core/mapper/WxUserMemberMapper.java | 3 + .../flossom/common/core/utils/PageUtils.java | 3 +- .../core/web/controller/BaseController.java | 4 +- .../resources/mapper/WxClockLogMapper.xml | 12 +- .../mapper/WxClockStatisticsMapper.xml | 112 +++++++++++++++ .../resources/mapper/WxUserMemberMapper.xml | 4 + .../controller/WxClockLogController.java | 26 +++- .../service/IWxClockLogService.java | 4 + .../service/impl/WxClockLogServiceImpl.java | 129 ++++++++++++++++-- 11 files changed, 463 insertions(+), 15 deletions(-) create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxClockStatistics.java create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockStatisticsMapper.java create mode 100644 flossom-common/flossom-common-core/src/main/resources/mapper/WxClockStatisticsMapper.xml diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxClockStatistics.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxClockStatistics.java new file mode 100644 index 0000000..9183888 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxClockStatistics.java @@ -0,0 +1,116 @@ +package com.flossom.common.core.domain.entity; + +import java.math.BigDecimal; + +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; + +/** + * 用户打卡统计信息对象 wx_clock_statistics + * + * @author flossom + * @date 2024-01-30 + */ +public class WxClockStatistics extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * $column.columnComment + */ + private Long id; + + /** + * 年份 + */ + @Excel(name = "年") + private Integer year; + + /** + * 月份 + */ + @Excel(name = "月份") + private Integer month; + + /** + * 微信用户 + */ + @Excel(name = "微信用户") + private Long userId; + + /** + * 打卡天数 + */ + @Excel(name = "打卡天数") + private Integer clockNum; + + /** + * 超越多少比例用户 + */ + @Excel(name = "超越多少比例用户") + private BigDecimal percentage; + + /** + * 状态（0正常 1停用） + */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private Long status; + + public void setId(Long id) { + this.id = id; + } + + public Long getId() { + return id; + } + + public void setMonth(Integer month) { + this.month = month; + } + + public Integer getMonth() { + return month; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Long getUserId() { + return userId; + } + + public void setClockNum(Integer clockNum) { + this.clockNum = clockNum; + } + + public Integer getClockNum() { + return clockNum; + } + + public void setPercentage(BigDecimal percentage) { + this.percentage = percentage; + } + + public BigDecimal getPercentage() { + return percentage; + } + + public void setStatus(Long status) { + this.status = status; + } + + public Long getStatus() { + return status; + } + + public Integer getYear() { + return year; + } + + public void setYear(Integer year) { + this.year = year; + } +} diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockStatisticsMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockStatisticsMapper.java new file mode 100644 index 0000000..0d0fd80 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxClockStatisticsMapper.java @@ -0,0 +1,65 @@ +package com.flossom.common.core.mapper; + +import com.flossom.common.core.domain.entity.WxClockStatistics; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + + +/** + * 用户打卡统计信息Mapper接口 + * + * @author flossom + * @date 2024-01-30 + */ +public interface WxClockStatisticsMapper { + /** + * 查询用户打卡统计信息 + * + * @param id 用户打卡统计信息主键 + * @return 用户打卡统计信息 + */ + public WxClockStatistics selectWxClockStatisticsById(Long id); + + /** + * 查询用户打卡统计信息列表 + * + * @param wxClockStatistics 用户打卡统计信息 + * @return 用户打卡统计信息集合 + */ + public List selectWxClockStatisticsList(WxClockStatistics wxClockStatistics); + + /** + * 新增用户打卡统计信息 + * + * @param wxClockStatistics 用户打卡统计信息 + * @return 结果 + */ + public int insertWxClockStatistics(WxClockStatistics wxClockStatistics); + + /** + * 修改用户打卡统计信息 + * + * @param wxClockStatistics 用户打卡统计信息 + * @return 结果 + */ + public int updateWxClockStatistics(WxClockStatistics wxClockStatistics); + + /** + * 删除用户打卡统计信息 + * + * @param id 用户打卡统计信息主键 + * @return 结果 + */ + public int deleteWxClockStatisticsById(Long id); + + /** + * 批量删除用户打卡统计信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWxClockStatisticsByIds(Long[] ids); + + List selectByUserIdAndYearMonth(@Param("userIdList") List userIdList, @Param("year") int year, @Param("month") int month); +} diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java index 88f2a38..e3b4c3e 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java @@ -89,4 +89,7 @@ public interface WxUserMemberMapper { List selectWxUserMemberRetByIdList(@Param("userIdList") List userIdList); List selectWxUserMemberRetListByVm(WxUserMemberVm wxUserMemberVm); + + Integer selectWxUserTotal(); + } diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/utils/PageUtils.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/utils/PageUtils.java index da43468..b841efd 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/utils/PageUtils.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/utils/PageUtils.java @@ -15,7 +15,7 @@ public class PageUtils extends PageHelper /** * 设置请求分页数据 */ - public static void startPage() + public static Integer startPage() { PageDomain pageDomain = TableSupport.buildPageRequest(); Integer pageNum = pageDomain.getPageNum(); @@ -23,6 +23,7 @@ public class PageUtils extends PageHelper String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy()); Boolean reasonable = pageDomain.getReasonable(); PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable); + return pageNum; } /** diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/web/controller/BaseController.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/web/controller/BaseController.java index 479ac4f..6878a5c 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/web/controller/BaseController.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/web/controller/BaseController.java @@ -44,9 +44,9 @@ public class BaseController /** * 设置请求分页数据 */ - protected void startPage() + protected Integer startPage() { - PageUtils.startPage(); + return PageUtils.startPage(); } /** diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockLogMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockLogMapper.xml index 9bcb998..4598318 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockLogMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockLogMapper.xml @@ -13,6 +13,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -23,10 +25,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select id, user_id, instrument_id, instrument_name, clock_content, status, create_by, create_time from wx_clock_log + select id, user_id, instrument_id, instrument_name, clock_content, status, create_by, create_time, update_by, update_time from wx_clock_log + + + and `year` = #{year} + and `month` = #{month} + and user_id = #{userId} + and clock_num = #{clockNum} + and percentage = #{percentage} + and status = #{status} + + + + + + + + + insert into wx_clock_statistics + + `year`, + `month`, + user_id, + clock_num, + percentage, + status, + create_by, + create_time, + update_by, + update_time, + + + #{year}, + #{month}, + #{userId}, + #{clockNum}, + #{percentage}, + #{status}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update wx_clock_statistics + + `year` = #{year}, + `month` = #{month}, + user_id = #{userId}, + clock_num = #{clockNum}, + percentage = #{percentage}, + status = #{status}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from wx_clock_statistics where id = #{id} + + + + delete from wx_clock_statistics where id in + + #{id} + + + \ No newline at end of file diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml index 9374677..8aff65f 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml @@ -341,6 +341,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT count(1) as count FROM `wx_user_member` WHERE devices_num > 0 + + diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java index 4f3ff30..d0132e3 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java @@ -3,8 +3,7 @@ package com.flossom.miniProgram.controller; import com.flossom.common.core.constant.Constants; import com.flossom.common.core.domain.R; import com.flossom.common.core.domain.SysFile; -import com.flossom.common.core.domain.entity.WxClockLog; -import com.flossom.common.core.domain.entity.WxNursingLog; +import com.flossom.common.core.domain.entity.WxClockStatistics; import com.flossom.common.core.domain.req.WxClockLogReq; import com.flossom.common.core.domain.ret.WxClockLogRet; import com.flossom.common.core.exception.ServiceException; @@ -126,4 +125,27 @@ public class WxClockLogController extends BaseController { } + /** + * 获取打卡统计 + */ + @GetMapping("/clockStatistics") + public TableDataInfo clockStatistics(WxClockStatistics wxClockStatistics) { + Integer pageNum = startPage(); + List list = wxClockLogService.clockStatistics(wxClockStatistics, pageNum); + return getDataTable(list); + } + + + /** + * TODO： 后期迁移到 system 项目中 + * 定时任务接口 + * 每月第一天将上个月在redis中的数据同步到数据库中，计算打卡比率 + */ + @GetMapping("/clockStatisticsTimedTask") + public void clockStatisticsTimedTask(@RequestParam(value = "userIdList", required = false) List userIdList, + @RequestParam(value = "year", required = false) Integer year, + @RequestParam(value = "month", required = false) Integer month) { + wxClockLogService.clockStatisticsTimedTask(userIdList, year, month); + } + } diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxClockLogService.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxClockLogService.java index b006e01..22830d1 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxClockLogService.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxClockLogService.java @@ -1,6 +1,7 @@ package com.flossom.miniProgram.service; import com.flossom.common.core.domain.entity.WxClockLog; +import com.flossom.common.core.domain.entity.WxClockStatistics; import com.flossom.common.core.domain.req.WxClockLogReq; import com.flossom.common.core.domain.ret.WxClockLogRet; @@ -16,4 +17,7 @@ public interface IWxClockLogService { List selectWxClockLogList(); + List clockStatistics(WxClockStatistics wxClockStatistics, Integer pageNum); + + void clockStatisticsTimedTask(List userIdList, Integer year, Integer month); } diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java index d3e99f0..0f47c58 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java @@ -4,27 +4,31 @@ import com.flossom.common.core.domain.entity.*; import com.flossom.common.core.domain.req.WxClockLogReq; import com.flossom.common.core.domain.ret.WxClockLogRet; import com.flossom.common.core.enums.Status; -import com.flossom.common.core.mapper.WxClockImgMapper; -import com.flossom.common.core.mapper.WxClockInstrumentLogMapper; -import com.flossom.common.core.mapper.WxClockLogMapper; -import com.flossom.common.core.mapper.WxInstrumentMapper; +import com.flossom.common.core.mapper.*; import com.flossom.common.core.utils.DateUtils; import com.flossom.common.security.utils.SecurityUtils; import com.flossom.miniProgram.service.IWxClockLogService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; import java.util.Arrays; import java.util.List; import java.util.Objects; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import java.util.stream.Stream; @Service +@RefreshScope public class WxClockLogServiceImpl implements IWxClockLogService { @Autowired @@ -39,6 +43,18 @@ public class WxClockLogServiceImpl implements IWxClockLogService { @Autowired private WxInstrumentMapper wxInstrumentMapper; + @Autowired + private WxClockStatisticsMapper wxClockStatisticsMapper; + + @Autowired + private RedisTemplate redisTemplate; + + @Autowired + private WxUserMemberMapper wxUserMemberMapper; + + @Value("${rank.clock.redisKey}") + private String CLOCK_RANK_REDIS_KEY; + @Override @Transactional @@ -86,10 +102,45 @@ public class WxClockLogServiceImpl implements IWxClockLogService { .collect(Collectors.joining(",")); wxClockLog.setInstrumentName(instrumentNameList); } - if (wxClockLog.getId() == null) { - wxClockLogMapper.insertWxClockLog(wxClockLog); - } else { + + if (wxClockLog.getId() != null) { + wxClockLog.setUpdateBy(SecurityUtils.getLoginUser().getWxUserMember().getNickname()); + wxClockLog.setUpdateTime(DateUtils.getNowDate()); wxClockLogMapper.updateWxClockLog(wxClockLog); + } else { + // 当天第一次打卡 + wxClockLogMapper.insertWxClockLog(wxClockLog); + + /* 保存redis构建排名 */ + String redisKey = CLOCK_RANK_REDIS_KEY + LocalDate.now().getYear() + LocalDate.now().getMonthValue(); + redisTemplate.opsForZSet().incrementScore(redisKey, wxUserMember.getId(), 1); + // 保存打卡记录，不计算比例 + List userIdList = Arrays.asList(wxUserMember.getId()); + List wxClockStatisticsList = wxClockStatisticsMapper.selectByUserIdAndYearMonth(userIdList, LocalDate.now().getYear(), LocalDate.now().getMonthValue()); + if (wxClockStatisticsList != null && wxClockStatisticsList.size() == 0) { + // 数据库不存在则新增，也就是当月第一次打卡 + WxClockStatistics save = new WxClockStatistics(); + save.setYear(LocalDate.now().getYear()); + save.setMonth(LocalDate.now().getMonthValue()); + save.setUserId(wxUserMember.getId()); + save.setClockNum(1); + save.setPercentage(new BigDecimal(0)); + save.setStatus(Status.OK.getCode().longValue()); + save.setCreateBy(wxUserMember.getNickname()); + save.setCreateTime(DateUtils.getNowDate()); + save.setUpdateBy(wxUserMember.getNickname()); + save.setUpdateTime(DateUtils.getNowDate()); + wxClockStatisticsMapper.insertWxClockStatistics(save); + } else { + // 数据库存在则更新打卡次数，也就是当月第二次以上打卡 + WxClockStatistics wxClockStatistics = wxClockStatisticsList.get(0); + WxClockStatistics update = new WxClockStatistics(); + update.setId(wxClockStatistics.getId()); + update.setClockNum(wxClockStatistics.getClockNum() + 1); + update.setUpdateBy(wxUserMember.getNickname()); + update.setUpdateTime(DateUtils.getNowDate()); + wxClockStatisticsMapper.updateWxClockStatistics(update); + } } /* 先删除当天的打卡图片，保存打卡图片 */ @@ -142,6 +193,8 @@ public class WxClockLogServiceImpl implements IWxClockLogService { updateClockLog.setInstrumentName(newWxClockLog.getInstrumentName() + "," + instrument.getName()); } updateClockLog.setId(newWxClockLog.getId()); + updateClockLog.setUpdateBy(SecurityUtils.getLoginUser().getWxUserMember().getNickname()); + updateClockLog.setUpdateTime(DateUtils.getNowDate()); wxClockLogMapper.updateWxClockLog(updateClockLog); } } @@ -182,7 +235,7 @@ public class WxClockLogServiceImpl implements IWxClockLogService { WxClockImg wxClockImg = new WxClockImg(); wxClockImg.setUserClockId(wxClockLogRet.getId()); List wxClockImgs = wxClockImgMapper.selectWxClockImgList(wxClockImg); - if (wxClockImgs!=null && wxClockImgs.size()>0) { + if (wxClockImgs != null && wxClockImgs.size() > 0) { List collect = wxClockImgs.stream().map(WxClockImg::getClockImg).collect(Collectors.toList()); wxClockLogRet.setClockImg(collect); } @@ -190,4 +243,62 @@ public class WxClockLogServiceImpl implements IWxClockLogService { } return list; } + + @Override + public List clockStatistics(WxClockStatistics wxClockStatistics, Integer pageNum) { + // 获取历史统计信息，数据在数据库 + List list = wxClockStatisticsMapper.selectWxClockStatisticsList(wxClockStatistics); + if (list != null && list.size() > 0 && pageNum == 1) { + /* 当前月，则需要从redis中获取排名，计算比例 */ + WxClockStatistics isCurrent = list.get(0); + // 获取排名 + String redisKey = CLOCK_RANK_REDIS_KEY + LocalDate.now().getYear() + LocalDate.now().getMonthValue(); + Long rank = redisTemplate.opsForZSet().reverseRank(redisKey, SecurityUtils.getLoginUser().getWxUserMember().getId()); + if (rank != null) { + // 计算超越百分比 + Integer wxUserTotal = wxUserMemberMapper.selectWxUserTotal(); + BigDecimal percentage = new BigDecimal(wxUserTotal - (rank + 1)) + .divide(new BigDecimal(wxUserTotal), 3, RoundingMode.HALF_UP); + isCurrent.setPercentage(percentage); + } + } + return list; + } + + @Override + public void clockStatisticsTimedTask(List userIdList, Integer year, Integer month) { + if (year == null || month == null) { + LocalDate localDate = LocalDate.now().minusMonths(1); + year = localDate.getYear(); + month = localDate.getMonthValue(); + } + List wxClockStatisticsList = wxClockStatisticsMapper.selectByUserIdAndYearMonth(userIdList, year, month); + if (wxClockStatisticsList != null && wxClockStatisticsList.size() > 0) { + String redisKey = CLOCK_RANK_REDIS_KEY + year + month; + for (WxClockStatistics wxClockStatistics : wxClockStatisticsList) { + redisTemplate.opsForZSet().add(redisKey, wxClockStatistics.getUserId(), wxClockStatistics.getClockNum()); + } + } + if (wxClockStatisticsList != null && wxClockStatisticsList.size() > 0) { + String redisKey = CLOCK_RANK_REDIS_KEY + year + month; + WxClockStatistics update; + for (WxClockStatistics wxClockStatistics : wxClockStatisticsList) { + // 获取排名 + Long rank = redisTemplate.opsForZSet().reverseRank(redisKey, wxClockStatistics.getUserId()); + // 计算超越百分比 + Integer wxUserTotal = wxUserMemberMapper.selectWxUserTotal(); + BigDecimal percentage = new BigDecimal(wxUserTotal - (rank + 1)) + .divide(new BigDecimal(wxUserTotal), 3, RoundingMode.HALF_UP); + update = new WxClockStatistics(); + update.setPercentage(percentage); + update.setId(wxClockStatistics.getId()); + // update.setUpdateBy(SecurityUtils.getUsername()); + update.setUpdateTime(DateUtils.getNowDate()); + wxClockStatisticsMapper.updateWxClockStatistics(update); + } + } + redisTemplate.delete(CLOCK_RANK_REDIS_KEY + year + month); + } + + } From 9b484e2586e3d19a269b819ac53dc6d674988fb1 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Wed, 31 Jan 2024 16:41:27 +0800 Subject: [PATCH 16/30] =?UTF-8?q?updateTime=20=E4=B8=BA=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=9A=84=E4=BF=9D=E5=AD=98=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../miniProgram/service/impl/WxInstrumentServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java index 263b0c7..371bb80 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java @@ -210,6 +210,8 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { saveEntity.setStatus(Status.OK.getCode().longValue()); saveEntity.setCreateBy(wxUserMember.getNickname()); saveEntity.setCreateTime(DateUtils.getNowDate()); + saveEntity.setUpdateBy(wxUserMember.getNickname()); + saveEntity.setUpdateTime(DateUtils.getNowDate()); wxUserInstrumentMapper.insertWxUserInstrument(saveEntity); // 更新仪器序列号绑定状态 From ff05fd3fa368f58d5857315842340d8ae5574a5f Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Wed, 31 Jan 2024 16:58:45 +0800 Subject: [PATCH 17/30] =?UTF-8?q?=E5=90=8E=E5=8F=B0-=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E7=9A=84=E5=8F=AF=E5=B1=95=E7=A4=BA=E6=95=B0=E9=87=8F=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0100=E6=9D=A1/=E9=A1=B5=20=E3=80=81=20500=E6=9D=A1/?= =?UTF-8?q?=E9=A1=B5=20=E3=80=81=201000=E6=9D=A1/=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flossom-ui/src/components/Pagination/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flossom-ui/src/components/Pagination/index.vue b/flossom-ui/src/components/Pagination/index.vue index 56f5a6b..4a86df5 100644 --- a/flossom-ui/src/components/Pagination/index.vue +++ b/flossom-ui/src/components/Pagination/index.vue @@ -36,7 +36,7 @@ export default { pageSizes: { type: Array, default() { - return [10, 20, 30, 50] + return [10, 20, 30, 50, 100, 500, 1000] } }, // 移动端页码按钮的数量端默认值5 From 1a56f39b2cb305b46fc7c40efd399285a8a33738 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Wed, 31 Jan 2024 17:22:07 +0800 Subject: [PATCH 18/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flossom-ui/src/views/system/siteCarouselInfo/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/flossom-ui/src/views/system/siteCarouselInfo/index.vue b/flossom-ui/src/views/system/siteCarouselInfo/index.vue index 50a244d..d06ab9c 100644 --- a/flossom-ui/src/views/system/siteCarouselInfo/index.vue +++ b/flossom-ui/src/views/system/siteCarouselInfo/index.vue @@ -827,7 +827,6 @@ export default { updateTime: null, } this.resetForm('form'); - this.$refs.upload.clearFiles(); }, /** 搜索按钮操作 */ handleQuery() { From 6dcf63e21c7d29db51baa174809611c7996a32ac Mon Sep 17 00:00:00 2001 From: blak-kong <546598185@qq.com> Date: Wed, 31 Jan 2024 18:03:51 +0800 Subject: [PATCH 19/30] =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flossom-ui/src/views/system/member/index.vue | 4592 ++++++++++-------- 1 file changed, 2636 insertions(+), 1956 deletions(-) diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue index a66b42c..78b453a 100644 --- a/flossom-ui/src/views/system/member/index.vue +++ b/flossom-ui/src/views/system/member/index.vue @@ -1,1988 +1,2668 @@ + + \ No newline at end of file From 666b7f33dfff0650121622aaf79b3c955cc45348 Mon Sep 17 00:00:00 2001 From: blak-kong <546598185@qq.com> Date: Wed, 31 Jan 2024 18:08:30 +0800 Subject: [PATCH 20/30] =?UTF-8?q?fix=EF=BC=9A=E5=AD=97=E4=BD=93=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flossom-ui/src/views/system/member/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue index 78b453a..3e4dbe7 100644 --- a/flossom-ui/src/views/system/member/index.vue +++ b/flossom-ui/src/views/system/member/index.vue @@ -1,6 +1,6 @@ 设置企微可见标签 + >设置外部可见标签 Date: Thu, 1 Feb 2024 11:44:36 +0800 Subject: [PATCH 25/30] =?UTF-8?q?we200=E5=8D=87=E7=BA=A7=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/entity/WxInstrument.java | 75 ++++--- .../core/domain/req/WxInstrumentSaveReq.java | 39 ++++ .../resources/mapper/WxInstrumentMapper.xml | 17 +- .../service/impl/WxInstrumentServiceImpl.java | 6 + .../src/views/system/instrument/index.vue | 188 ++++++++++++++---- 5 files changed, 243 insertions(+), 82 deletions(-) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrument.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrument.java index e365cfc..15e458e 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrument.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrument.java @@ -215,6 +215,21 @@ public class WxInstrument extends BaseEntity { */ private String scanCodeBinding; + /** + * we200iot版本 + */ + private String we200IotVersion; + + /** + * we200iot升级数据文件 + */ + private String we200IotUpgradeData; + + /** + * we200iot版本升级说明 + */ + private String we200IotVersionUpgrade; + public void setId(Long id) { this.id = id; } @@ -527,45 +542,27 @@ public class WxInstrument extends BaseEntity { this.bluetoothConnectFailContent = bluetoothConnectFailContent; } + public String getWe200IotVersion() { + return we200IotVersion; + } + + public void setWe200IotVersion(String we200IotVersion) { + this.we200IotVersion = we200IotVersion; + } + + public String getWe200IotUpgradeData() { + return we200IotUpgradeData; + } + + public void setWe200IotUpgradeData(String we200IotUpgradeData) { + this.we200IotUpgradeData = we200IotUpgradeData; + } + + public String getWe200IotVersionUpgrade() { + return we200IotVersionUpgrade; + } - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("name", getName()) - .append("type", getType()) - .append("model", getModel()) - .append("banner", getBanner()) - .append("logo", getLogo()) - .append("serial", getSerial()) - .append("guarantee", getGuarantee()) - .append("dailyClockCredit", getDailyClockCredit()) - .append("extraClockCredit", getExtraClockCredit()) - .append("startTime", getStartTime()) - .append("endTime", getEndTime()) - .append("miniTagIds", getMiniTagIds()) - .append("miniTagNames", getMiniTagNames()) - .append("wecomTagIds", getWecomTagIds()) - .append("wecomTagNames", getWecomTagNames()) - .append("nursingTime", getNursingTime()) - .append("iotVersion", getIotVersion()) - .append("iotUpgradeData", getIotUpgradeData()) - .append("isScanCode", getIsScanCode()) - .append("isPurchase", getIsPurchase()) - .append("shoppingAppid", getShoppingAppid()) - .append("shoppingPath", getShoppingPath()) - .append("bluetoothConnecting", getBluetoothConnecting()) - .append("bluetoothClosed", getBluetoothClosed()) - .append("iotVersionUpgrade", getIotVersionUpgrade()) - .append("sortNo", getSortNo()) - .append("status", getStatus()) - .append("manualCodeBinding", getManualCodeBinding()) - .append("scanCodeBinding", getScanCodeBinding()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); + public void setWe200IotVersionUpgrade(String we200IotVersionUpgrade) { + this.we200IotVersionUpgrade = we200IotVersionUpgrade; } } diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSaveReq.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSaveReq.java index 71dac62..efb29a3 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSaveReq.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSaveReq.java @@ -208,6 +208,21 @@ public class WxInstrumentSaveReq { */ private String scanCodeBinding; + /** + * we200iot版本 + */ + private String we200IotVersion; + + /** + * we200iot升级数据文件 + */ + private String we200IotUpgradeData; + + /** + * we200iot版本升级说明 + */ + private String we200IotVersionUpgrade; + /** * 初次护理介绍视频/图片 @@ -541,4 +556,28 @@ public class WxInstrumentSaveReq { public void setNewModeIdList(List newModeIdList) { this.newModeIdList = newModeIdList; } + + public String getWe200IotVersion() { + return we200IotVersion; + } + + public void setWe200IotVersion(String we200IotVersion) { + this.we200IotVersion = we200IotVersion; + } + + public String getWe200IotUpgradeData() { + return we200IotUpgradeData; + } + + public void setWe200IotUpgradeData(String we200IotUpgradeData) { + this.we200IotUpgradeData = we200IotUpgradeData; + } + + public String getWe200IotVersionUpgrade() { + return we200IotVersionUpgrade; + } + + public void setWe200IotVersionUpgrade(String we200IotVersionUpgrade) { + this.we200IotVersionUpgrade = we200IotVersionUpgrade; + } } diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml index a288dfa..9b86309 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml @@ -49,10 +49,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + - select id, name, type, model, banner, logo, serial, guarantee, daily_clock_credit, is_extra_clock, binding_credit, extra_clock_credit, start_time, end_time, mini_tag_ids, mini_tag_names, wecom_tag_ids, wecom_tag_names, nursing_time, iot_version, iot_upgrade_data, is_scan_code, is_purchase, shopping_appid, shopping_path, bluetooth_connecting_title, bluetooth_connecting_content,bluetooth_connecting, bluetooth_closed_title, bluetooth_closed_content, bluetooth_closed, bluetooth_connect_fail_title, bluetooth_connect_fail_content, bluetooth_connect_fail, iot_version_upgrade, sort_no, status, manual_code_binding, scan_code_binding, create_by, create_time, update_by, update_time, remark from wx_instrument + select id, name, type, model, banner, logo, serial, guarantee, daily_clock_credit, is_extra_clock, binding_credit, extra_clock_credit, start_time, end_time, mini_tag_ids, mini_tag_names, wecom_tag_ids, wecom_tag_names, nursing_time, iot_version, iot_upgrade_data, is_scan_code, is_purchase, shopping_appid, shopping_path, bluetooth_connecting_title, bluetooth_connecting_content,bluetooth_connecting, bluetooth_closed_title, bluetooth_closed_content, bluetooth_closed, bluetooth_connect_fail_title, bluetooth_connect_fail_content, bluetooth_connect_fail, iot_version_upgrade, sort_no, status, manual_code_binding, scan_code_binding, create_by, create_time, update_by, update_time, remark, we200_iot_version, we200_iot_upgrade_data, we200_iot_version_upgrade from wx_instrument @@ -198,6 +204,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_time, remark, + we200_iot_version, + we200_iot_upgrade_data, + we200_iot_version_upgrade, #{name}, @@ -243,6 +252,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{remark}, + #{we200IotVersion}, + #{we200IotUpgradeData}, + #{we200IotVersionUpgrade}, @@ -292,6 +304,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, + we200_iot_version = #{we200IotVersion}, + we200_iot_upgrade_data = #{we200IotUpgradeData}, + we200_iot_version_upgrade = #{we200IotVersionUpgrade}, where id = #{id} diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java index 371bb80..095af44 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java @@ -80,6 +80,8 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { @Override public List bindingInstrumentList() { + // TODO: 仪器隐藏？？？？ + /* 绑定了的仪器 不受 "可见小程序标签/可见外部标签" 影响 */ return wxInstrumentMapper.selectBindingInstrumentListByUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); } @@ -87,6 +89,8 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { public List unbindingInstrumentInfoList() { List returnList = new ArrayList<>(); List wxInstrumentList = wxInstrumentMapper.selectUnbindingInstrumentListByUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); + // TODO: 仪器隐藏？？？？ + /* 未绑定的仪器 受 "可见小程序标签/可见外部标签" 影响，需要用户拥有全部对应的标签才可见 */ if (wxInstrumentList != null && wxInstrumentList.size() > 0) { // 用户拥有的标签 WxUserTag wxUserTag = new WxUserTag(); @@ -134,6 +138,8 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { * @param serial 序列号 * @param serialImage 序列号图片 * @param isImmediatelyBinding 不立即绑定仪器，页面需要询问用户是否绑定 + *

+ * 绑定流程中仪器 不受 "可见小程序标签/可见外部标签" 影响 */ @Override @Transactional diff --git a/flossom-ui/src/views/system/instrument/index.vue b/flossom-ui/src/views/system/instrument/index.vue index 4f63d37..a38995b 100644 --- a/flossom-ui/src/views/system/instrument/index.vue +++ b/flossom-ui/src/views/system/instrument/index.vue @@ -571,48 +571,6 @@ > - -

- - - -
- - - -
- - - -
- - 点击上传 -
只能上传一个文件
- - + +
+ + + +
+ + + +
+ + + +
+ + 点击上传 +
只能上传一个文件
+ + + + +
+ + + +
+ + + +
+ + + +
+ + 点击上传 +
只能上传一个文件
+ + + +
+ + + +
+ +
确 定 @@ -1278,6 +1342,11 @@ export default { uploadHide: false, fileList: [], }, + /* we200iot升级数据文件 */ + we200IotUpgradeFile: { + uploadHide: false, + fileList: [], + }, /* 蓝牙连接文件 */ bluetoothConnectFile: { uploadHide: false, @@ -1510,6 +1579,9 @@ export default { introduceList: null, modeIdsValue: [], newModeIdList: [], + we200IotVersion: null, + we200IotUpgradeData: null, + we200IotVersionUpgrade: null, } /* 仪器封面 */ this.bannerFile = { @@ -1878,6 +1950,17 @@ export default { this.$message.error('图片插入失败') } }, + /* iot升级数据文件 */ + we200IotUpgradeUploadExceed(files, fileList) { + this.$message.warning(`您已上传了文件，如需更换，请先删除原上传的文件`) + }, + we200IotUpgradeUploadSuccess(response, file) { + if (response.code == 200) { + this.form.we200IotUpgradeData = response.data.url + } else { + this.$message.error('图片插入失败') + } + }, /* 蓝牙连接图片 */ bluetoothConnectUploadExceed(files, fileList) { this.$message.warning(`您已上传了文件，如需更换，请先删除原上传的文件`) @@ -2351,4 +2434,25 @@ video { left: -140px; color: #FAAD14; } + +.we200-absolute-info { + position: absolute; + top: 10px; + left: -183px; + color: #FAAD14; +} + +.we200-iotVersion-absolute-info { + position: absolute; + top: 10px; + left: -128px; + color: #FAAD14; +} + +.we200-iotUpgradeData-absolute-info { + position: absolute; + top: 10px; + left: -184px; + color: #FAAD14; +} From 086bd1c44e054856bea8189cb539278255a7bd54 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Thu, 1 Feb 2024 11:56:13 +0800 Subject: [PATCH 26/30] =?UTF-8?q?we200=E5=8D=87=E7=BA=A7=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=8C=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../miniProgram/controller/WxInstrumentController.java | 4 ++-- .../miniProgram/service/IWxInstrumentService.java | 2 +- .../service/impl/WxInstrumentServiceImpl.java | 9 +++++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxInstrumentController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxInstrumentController.java index 1e6ef3f..46679a7 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxInstrumentController.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxInstrumentController.java @@ -144,8 +144,8 @@ public class WxInstrumentController extends BaseController { * 1）第一位不相同的情况下，判断后面两位，后台的比设备的大，则强行升级 */ @GetMapping(value = "/upgrade") - public R upgrade(@RequestParam("instrumentId") Long instrumentId) { - return R.ok(wxInstrumentService.upgrade(instrumentId)); + public R upgrade(@RequestParam("instrumentId") Long instrumentId, @RequestParam(value = "isWe200") Boolean isWe200) { + return R.ok(wxInstrumentService.upgrade(instrumentId, isWe200)); } /** diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxInstrumentService.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxInstrumentService.java index 01b847b..a67b808 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxInstrumentService.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxInstrumentService.java @@ -29,7 +29,7 @@ public interface IWxInstrumentService { WxInstrumentSerial determineSerialIsSameInstrument(String serial, Long instrumentId); - String upgrade(Long instrumentId); + String upgrade(Long instrumentId, Boolean isWe200); WxBindingInstrumentInfo bindingInstrumentInfo(Long instrumentId); } diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java index 095af44..1296c3d 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java @@ -431,12 +431,17 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { } @Override - public String upgrade(Long instrumentId) { + public String upgrade(Long instrumentId, Boolean isWe200) { WxInstrument wxInstrument = wxInstrumentMapper.selectWxInstrumentById(instrumentId); if (wxInstrument != null && StringUtils.isNotBlank(wxInstrument.getIotUpgradeData())) { // 读取文件系统中的文件 try { - byte[] byteArray = FileCopyUtils.copyToByteArray(new URL(wxInstrument.getIotUpgradeData()).openStream()); + byte[] byteArray; + if (isWe200) { + byteArray = FileCopyUtils.copyToByteArray(new URL(wxInstrument.getWe200IotUpgradeData()).openStream()); + } else { + byteArray = FileCopyUtils.copyToByteArray(new URL(wxInstrument.getIotUpgradeData()).openStream()); + } return DatatypeConverter.printHexBinary(byteArray); } catch (FileNotFoundException e) { logger.error("instrumentId:{} 升级失败: {}", instrumentId, e.getMessage()); From c6a2bd5781fc2306182bcebe8b3867e7eb347b12 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Thu, 1 Feb 2024 14:19:36 +0800 Subject: [PATCH 27/30] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F-=E4=BB=AA?= =?UTF-8?q?=E5=99=A8=E5=93=8D=E5=BA=94=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/enums/InstrumentHttpCodeEnum.java | 30 +++++++++++++++++ .../service/impl/WxInstrumentServiceImpl.java | 33 +++++++++++++------ 2 files changed, 53 insertions(+), 10 deletions(-) create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/InstrumentHttpCodeEnum.java diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/InstrumentHttpCodeEnum.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/InstrumentHttpCodeEnum.java new file mode 100644 index 0000000..ba6ff48 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/InstrumentHttpCodeEnum.java @@ -0,0 +1,30 @@ +package com.flossom.common.core.enums; + +public enum InstrumentHttpCodeEnum { + + TWO_HUNDRED_AND_ONE(201, "可以绑定，但是不立即绑定，页面需要询问用户是否绑定"), + TWO_HUNDRED_AND_TWO(202, "绑定过该类型仪器，但当前扫码的序列号与以前绑定的仪器的序列号不一致，询问用户是否换绑仪器"), + TWO_HUNDRED_AND_THREE(203, "当前序列码被别人绑定了，联系客服"), + TWO_HUNDRED_AND_FOUR(204, "用户选择的仪器与序列号对应的仪器不一致"), + TWO_HUNDRED_AND_FIVE(205, "序列号不存在，联系客服"), + TWO_HUNDRED_AND_SIX(206, "绑定失败，不存在该仪器，请联系客服"), + ; + + private final Integer code; + private final String info; + + InstrumentHttpCodeEnum(Integer code, String info) { + this.code = code; + this.info = info; + } + + public Integer getCode() { + return code; + } + + public String getInfo() { + return info; + } + + +} diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java index 1296c3d..c9e8de1 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java @@ -80,16 +80,15 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { @Override public List bindingInstrumentList() { - // TODO: 仪器隐藏？？？？ - /* 绑定了的仪器 不受 "可见小程序标签/可见外部标签" 影响 */ + /* 绑定了的仪器 不受 "可见小程序标签/可见外部标签" 影响， 去除仪器隐藏的 */ return wxInstrumentMapper.selectBindingInstrumentListByUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); } @Override public List unbindingInstrumentInfoList() { List returnList = new ArrayList<>(); + /* 去除仪器隐藏的 */ List wxInstrumentList = wxInstrumentMapper.selectUnbindingInstrumentListByUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); - // TODO: 仪器隐藏？？？？ /* 未绑定的仪器 受 "可见小程序标签/可见外部标签" 影响，需要用户拥有全部对应的标签才可见 */ if (wxInstrumentList != null && wxInstrumentList.size() > 0) { // 用户拥有的标签 @@ -128,8 +127,8 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { WxInstrumentSerial wxInstrumentSerial = wxInstrumentSerialMapper.selectEntityListBySerial(query); // 序列号唯一 if (wxInstrumentSerial == null) { - logger.info("serial:{}, 没有对应的数据", serial); - throw new ServiceReturnCodeException("没有对应的序列号，跳转联系客服", 203); + logger.info("serial:{}, 序列号不存在", serial); + throw new ServiceReturnCodeException(InstrumentHttpCodeEnum.TWO_HUNDRED_AND_FIVE.getInfo(), InstrumentHttpCodeEnum.TWO_HUNDRED_AND_FIVE.getCode()); } return wxInstrumentSerial; } @@ -175,7 +174,7 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { if (!StringUtils.equals(wxUserInstrument.getSerial(), serial)) { /* 2.1.2、绑定过仪器，但不是同一个序列号，询问是否需要换绑 */ logger.info("绑定过该类型仪器，但当前扫码的序列号与以前绑定的仪器的序列号不一致，询问用户是否换绑仪器"); - throw new ServiceReturnCodeException("绑定过该类型仪器，但当前扫码的序列号与以前绑定的仪器的序列号不一致，询问用户是否换绑仪器", 202); + throw new ServiceReturnCodeException(InstrumentHttpCodeEnum.TWO_HUNDRED_AND_TWO.getInfo(), InstrumentHttpCodeEnum.TWO_HUNDRED_AND_TWO.getCode()); } logger.info("扫码序列号与当前用户绑定的序列号一致，无需绑定，返回响应"); } @@ -184,7 +183,7 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { // 不立即绑定 if (!isImmediatelyBinding) { logger.info("可以绑定，但是不立即绑定，页面需要询问用户是否绑定"); - throw new ServiceReturnCodeException("可以绑定，但是不立即绑定，页面需要询问用户是否绑定", 201); + throw new ServiceReturnCodeException(InstrumentHttpCodeEnum.TWO_HUNDRED_AND_ONE.getInfo(), InstrumentHttpCodeEnum.TWO_HUNDRED_AND_ONE.getCode()); } /* 2.2.1、判断序列号是否被别人绑定了 */ @@ -196,11 +195,15 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { Integer num = wxUserInstrumentMapper.selectUiByInstrumentId(query); if (num != null && num > 0) { logger.info("被别人绑定了，页面跳转联系客服"); - throw new ServiceReturnCodeException("当前序列码被别人绑定了，页面跳转联系客服", 203); + throw new ServiceReturnCodeException(InstrumentHttpCodeEnum.TWO_HUNDRED_AND_THREE.getInfo(), InstrumentHttpCodeEnum.TWO_HUNDRED_AND_THREE.getCode()); } /* 2.2.2、绑定仪器 */ else { WxInstrument wxInstrument = wxInstrumentMapper.selectWxInstrumentById(wxInstrumentSerial.getInstrumentId()); + if (wxInstrument != null && wxInstrument.getStatus().intValue() == Status.DISABLE.getCode()) { + logger.info("仪器({})被隐藏了，无法绑定", wxInstrumentSerial.getInstrumentId()); + throw new ServiceReturnCodeException(InstrumentHttpCodeEnum.TWO_HUNDRED_AND_SIX.getInfo(), InstrumentHttpCodeEnum.TWO_HUNDRED_AND_SIX.getCode()); + } WxUserInstrument saveEntity = new WxUserInstrument(); saveEntity.setUserId(wxUserMember.getId()); saveEntity.setSerial(serial); @@ -293,7 +296,12 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { Integer num = wxUserInstrumentMapper.selectUiByInstrumentId(query); if (num != null && num > 0) { logger.info("被别人绑定了，页面跳转联系客服"); - throw new ServiceReturnCodeException("当前序列码被别人绑定了，页面跳转联系客服", 203); + throw new ServiceReturnCodeException(InstrumentHttpCodeEnum.TWO_HUNDRED_AND_THREE.getInfo(), InstrumentHttpCodeEnum.TWO_HUNDRED_AND_THREE.getCode()); + } + WxInstrument wxInstrument = wxInstrumentMapper.selectWxInstrumentById(newInstrumentSerial.getInstrumentId()); + if (wxInstrument != null && wxInstrument.getStatus().intValue() == Status.DISABLE.getCode()) { + logger.info("仪器({})被隐藏了，无法绑定", newInstrumentSerial.getInstrumentId()); + throw new ServiceReturnCodeException(InstrumentHttpCodeEnum.TWO_HUNDRED_AND_SIX.getInfo(), InstrumentHttpCodeEnum.TWO_HUNDRED_AND_SIX.getCode()); } /* 3、换绑 */ @@ -425,7 +433,12 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { WxInstrumentSerial wxInstrumentSerial = getInstrumentInfoBySerial(serial); if (wxInstrumentSerial.getInstrumentId() != instrumentId) { logger.info("用户选择的仪器与序列号对应的仪器不一致，序列号：{}， 仪器ID：{}", serial, instrumentId); - throw new ServiceReturnCodeException("用户选择的仪器与序列号对应的仪器不一致", 204); + throw new ServiceReturnCodeException(InstrumentHttpCodeEnum.TWO_HUNDRED_AND_FOUR.getInfo(), InstrumentHttpCodeEnum.TWO_HUNDRED_AND_FOUR.getCode()); + } + WxInstrument wxInstrument = wxInstrumentMapper.selectWxInstrumentById(wxInstrumentSerial.getInstrumentId()); + if (wxInstrument != null && wxInstrument.getStatus().intValue() == Status.DISABLE.getCode()) { + logger.info("仪器({})被隐藏了，无法绑定", wxInstrumentSerial.getInstrumentId()); + throw new ServiceReturnCodeException(InstrumentHttpCodeEnum.TWO_HUNDRED_AND_SIX.getInfo(), InstrumentHttpCodeEnum.TWO_HUNDRED_AND_SIX.getCode()); } return wxInstrumentSerial; } From ae96c92b69eb3089f5905d2e29f3854d00ade759 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Thu, 1 Feb 2024 15:40:42 +0800 Subject: [PATCH 28/30] =?UTF-8?q?=E4=BB=AA=E5=99=A8=E8=AF=B4=E6=98=8E?= =?UTF-8?q?=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/WxInstrumentInstructions.java | 13 +++++++++ .../WxInstrumentInstructionsServiceImpl.java | 16 ++++++++++- .../src/views/system/instrument/index.vue | 28 +++++++++++++------ flossom-ui/vue.config.js | 5 ++-- 4 files changed, 51 insertions(+), 11 deletions(-) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrumentInstructions.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrumentInstructions.java index c8aba42..f44b662 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrumentInstructions.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrumentInstructions.java @@ -37,6 +37,11 @@ public class WxInstrumentInstructions extends BaseEntity { @Excel(name = "说明书链接") private String link; + /** + * 拼接接口地址给用户复制使用 + */ + private String nameUrl; + /** * 状态（0正常 1停用） */ @@ -83,6 +88,14 @@ public class WxInstrumentInstructions extends BaseEntity { return status; } + public String getNameUrl() { + return nameUrl; + } + + public void setNameUrl(String nameUrl) { + this.nameUrl = nameUrl; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentInstructionsServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentInstructionsServiceImpl.java index 0f7ea9e..349ec03 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentInstructionsServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentInstructionsServiceImpl.java @@ -6,6 +6,8 @@ import com.flossom.common.core.domain.entity.WxInstrumentInstructions; import com.flossom.common.core.mapper.WxInstrumentInstructionsMapper; import com.flossom.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.stereotype.Service; import com.flossom.system.service.IWxInstrumentInstructionsService; @@ -16,11 +18,15 @@ import com.flossom.system.service.IWxInstrumentInstructionsService; * @date 2024-01-16 */ @Service +@RefreshScope public class WxInstrumentInstructionsServiceImpl implements IWxInstrumentInstructionsService { @Autowired private WxInstrumentInstructionsMapper wxInstrumentInstructionsMapper; + @Value("${instruction.domain}") + private String instructionDomain; + /** * 查询仪器说明书 * @@ -40,7 +46,15 @@ public class WxInstrumentInstructionsServiceImpl implements IWxInstrumentInstruc */ @Override public List selectWxInstrumentInstructionsList(WxInstrumentInstructions wxInstrumentInstructions) { - return wxInstrumentInstructionsMapper.selectWxInstrumentInstructionsList(wxInstrumentInstructions); + List instructionList = wxInstrumentInstructionsMapper.selectWxInstrumentInstructionsList(wxInstrumentInstructions); + if (instructionList != null && instructionList.size() > 0) { + for (WxInstrumentInstructions instrumentInstructions : instructionList) { + StringBuffer url = new StringBuffer(instructionDomain); + StringBuffer nameUrl = url.append("/book?type=").append(instrumentInstructions.getName()).append("&id=").append(instrumentInstructions.getInstrumentId()); + instrumentInstructions.setNameUrl(nameUrl.toString()); + } + } + return instructionList; } /** diff --git a/flossom-ui/src/views/system/instrument/index.vue b/flossom-ui/src/views/system/instrument/index.vue index a38995b..ed17aa2 100644 --- a/flossom-ui/src/views/system/instrument/index.vue +++ b/flossom-ui/src/views/system/instrument/index.vue @@ -1188,26 +1188,33 @@ @@ -2279,7 +2286,7 @@ export default { for (let i = 0; i < response.data.length; i++) { this.instrumentInstructions.instructionList[i].fileList = [ { - name: response.data[i].name + '.pdf', + name: response.data[i].name, url: response.data[i].url, }, ] @@ -2346,8 +2353,13 @@ export default { } }, viewInstrumentInstruction(item) { - window.open(item.link, '_blank') + window.open(item.nameUrl, '_blank') }, + copyInstructionNameUrl(item) { + navigator.clipboard.writeText(item.nameUrl).then(() => { + this.$message.success('已成功复制到剪贴板') + }); + }, /* 模式 */ openModeIdDialog() { this.mode.modeIdsValueTemp = [] diff --git a/flossom-ui/vue.config.js b/flossom-ui/vue.config.js index c89e41a..a4b129d 100644 --- a/flossom-ui/vue.config.js +++ b/flossom-ui/vue.config.js @@ -43,8 +43,9 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://110.41.134.131:8080`, - // target: `http://192.168.10.147:8080`, + // target: `http://110.41.134.131:8080`, + // target: `http://localhost:8080`, + target: `http://192.168.10.147:8080`, changeOrigin: true, pathRewrite: { ["^" + process.env.VUE_APP_BASE_API]: "", From 3a913e2c72a50f70d5102b2af122b8767dcf06f6 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Thu, 1 Feb 2024 15:44:00 +0800 Subject: [PATCH 29/30] revert --- flossom-ui/vue.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flossom-ui/vue.config.js b/flossom-ui/vue.config.js index a4b129d..b54bcc6 100644 --- a/flossom-ui/vue.config.js +++ b/flossom-ui/vue.config.js @@ -43,9 +43,9 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - // target: `http://110.41.134.131:8080`, + target: `http://110.41.134.131:8080`, // target: `http://localhost:8080`, - target: `http://192.168.10.147:8080`, + // target: `http://192.168.10.147:8080`, changeOrigin: true, pathRewrite: { ["^" + process.env.VUE_APP_BASE_API]: "", From 16b6e68044877baa02a32e9bb3c28b38b23fe995 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Thu, 1 Feb 2024 16:07:33 +0800 Subject: [PATCH 30/30] =?UTF-8?q?=E5=8D=95=E6=96=87=E4=BB=B6=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxClockLogController.java | 52 ++++--------------- 1 file changed, 10 insertions(+), 42 deletions(-) diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java index d0132e3..b3b5b4a 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java @@ -64,54 +64,22 @@ public class WxClockLogController extends BaseController { return getDataTable(list); } + /** + * 上传打卡图片 + */ + @PostMapping("/upload") + public R insertClockLog(@RequestParam(value = "clockImg") MultipartFile clockImg) { + return remoteFileService.upload(clockImg); + } + + /** * 新增用户打卡 * 需要记录当天使用过的全部仪器（打卡前后的全部仪器） * firstClockImg 第一张图片是必须的 */ @PostMapping("/insertClockLog") - public R insertClockLog(@RequestParam(value = "firstClockImg") MultipartFile firstClockImg, - @RequestParam(value = "secondClockImg") MultipartFile secondClockImg, - @RequestParam(value = "thirdClockImg") MultipartFile thirdClockImg, - @Validated WxClockLogReq wxClockLogReq) { - if (firstClockImg != null && StringUtils.isNotBlank(firstClockImg.getOriginalFilename())) { - R result = remoteFileService.upload(firstClockImg); - if (result.getCode() != Constants.SUCCESS) { - logger.error("上传打卡图片失败"); - throw new ServiceException("上传打卡图片失败"); - } - if (wxClockLogReq.getClockImageList() != null && wxClockLogReq.getClockImageList().size() > 0) { - wxClockLogReq.getClockImageList().set(0, result.getData().getUrl()); - } else { - wxClockLogReq.getClockImageList().add(result.getData().getUrl()); - } - } - if (secondClockImg != null && StringUtils.isNotBlank(secondClockImg.getOriginalFilename())) { - R result = remoteFileService.upload(secondClockImg); - if (result.getCode() != Constants.SUCCESS) { - logger.error("上传打卡图片失败"); - throw new ServiceException("上传打卡图片失败"); - } - if (wxClockLogReq.getClockImageList() != null && wxClockLogReq.getClockImageList().size() > 1) { - wxClockLogReq.getClockImageList().set(1, result.getData().getUrl()); - } else { - wxClockLogReq.getClockImageList().add(result.getData().getUrl()); - } - } - if (thirdClockImg != null && StringUtils.isNotBlank(thirdClockImg.getOriginalFilename())) { - R result = remoteFileService.upload(thirdClockImg); - if (result.getCode() != Constants.SUCCESS) { - logger.error("上传打卡图片失败"); - throw new ServiceException("上传打卡图片失败"); - } - if (wxClockLogReq.getClockImageList() != null && wxClockLogReq.getClockImageList().size() > 2 - && StringUtils.isNotBlank(wxClockLogReq.getClockImageList().get(2))) { - wxClockLogReq.getClockImageList().set(2, result.getData().getUrl()); - } else { - wxClockLogReq.getClockImageList().add(result.getData().getUrl()); - } - } - + public R insertClockLog(@Validated WxClockLogReq wxClockLogReq) { if (wxClockLogReq.getClockImageList() == null || wxClockLogReq.getClockImageList().size() == 0) { logger.error("请上传打卡图片"); throw new ServiceException("请上传打卡图片");