From 36efd718c560deead710303a92bcecf7c3a09caa Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Mon, 5 Feb 2024 09:46:00 +0800 Subject: [PATCH 01/23] =?UTF-8?q?=E6=8A=A4=E7=90=86=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=AA=E5=99=A8=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/entity/WxNursingLog.java | 13 +++++++++++++ .../service/impl/WxNursingLogServiceImpl.java | 5 +++++ 2 files changed, 18 insertions(+) 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 index 1d1a07b..f48aa85 100644 --- 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 @@ -33,6 +33,11 @@ public class WxNursingLog extends BaseEntity { */ private String instrumentName; + /** + * 仪器：1、普通仪器 2、iot仪器 + */ + private Integer instrumentType; + /** * 是否在线，1在线，2离线 */ @@ -161,4 +166,12 @@ public class WxNursingLog extends BaseEntity { public void setModeImage(String modeImage) { this.modeImage = modeImage; } + + public Integer getInstrumentType() { + return instrumentType; + } + + public void setInstrumentType(Integer instrumentType) { + this.instrumentType = instrumentType; + } } 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 f851140..4915e95 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 @@ -92,6 +92,11 @@ public class WxNursingLogServiceImpl implements IWxNursingLogService { if (wxMode != null) { nursingLog.setModeImage(wxMode.getModeBanner()); } + WxInstrument wxInstrument = wxInstrumentMapper.selectWxInstrumentById(nursingLog.getInstrumentId()); + if (wxInstrument != null) { + nursingLog.setInstrumentType(wxInstrument.getType()); + nursingLog.setInstrumentName(wxInstrument.getName()); + } } } return wxNursingLogList; From 43c092d6d00858053d63a4bd165bd0a83d66efa9 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Mon, 5 Feb 2024 10:18:23 +0800 Subject: [PATCH 02/23] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=B9=B4=E6=9C=88?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=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 --- .../controller/WxClockLogController.java | 18 ++++++++++++++---- .../service/IWxClockLogService.java | 2 +- .../service/impl/WxClockLogServiceImpl.java | 4 +--- 3 files changed, 16 insertions(+), 8 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 c234f4d..4dd8ccc 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,12 +3,14 @@ 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.WxClockStatistics; 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.common.security.utils.SecurityUtils; import com.flossom.miniProgram.service.IWxClockLogService; import com.flossom.system.api.RemoteFileService; import org.apache.commons.lang3.StringUtils; @@ -18,8 +20,13 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.validation.constraints.NotNull; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.YearMonth; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * 用户打卡Controller @@ -58,10 +65,13 @@ public class WxClockLogController extends BaseController { * 分页查询用户的打卡记录 */ @GetMapping("/list") - public TableDataInfo list() { - startPage(); - List list = wxClockLogService.selectWxClockLogList(); - return getDataTable(list); + public R list(@RequestParam(value = "year") Integer year, @RequestParam(value = "month") Integer month) { + WxClockLog queryClockLog = new WxClockLog(); + queryClockLog.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); + YearMonth targetYearMonth = YearMonth.of(year, month); + queryClockLog.getParams().put("beginTime", targetYearMonth.atDay(1).atStartOfDay()); + queryClockLog.getParams().put("endTime", targetYearMonth.atEndOfMonth().atTime(LocalTime.MAX)); + return R.ok(wxClockLogService.selectWxClockLogList(queryClockLog)); } /** 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 3caa599..ba8ce2b 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 @@ -15,7 +15,7 @@ public interface IWxClockLogService { WxClockLogRet latestClockRecord(); - List selectWxClockLogList(); + List selectWxClockLogList(WxClockLog queryClockLog); List clockStatistics(Integer year); 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 bfdfed6..36449cd 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 @@ -226,9 +226,7 @@ public class WxClockLogServiceImpl implements IWxClockLogService { } @Override - public List selectWxClockLogList() { - WxClockLog queryClockLog = new WxClockLog(); - queryClockLog.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); + public List selectWxClockLogList(WxClockLog queryClockLog) { List list = wxClockLogMapper.selectWxClockImgRetList(queryClockLog); if (list != null && list.size() > 0) { for (WxClockLogRet wxClockLogRet : list) { From 74535677c45e35c1add5d04492cea94b87c2e670 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Mon, 5 Feb 2024 10:39:51 +0800 Subject: [PATCH 03/23] =?UTF-8?q?bug=EF=BC=9A=E3=80=90ID1000364=E3=80=91?= =?UTF-8?q?=E8=AF=9D=E6=9C=AF=E7=AE=A1=E7=90=86-=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=EF=BC=8C=E6=B6=88=E6=81=AF=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=B8=BA=E7=BB=91=E5=AE=9A=E4=BB=AA=E5=99=A8=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E3=80=90=E4=BB=AA=E5=99=A8=E4=BF=A1=E6=81=AF=E3=80=91=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E3=80=90=E4=BB=AA=E5=99=A8=E5=90=8D=E7=A7=B0=E3=80=91?= =?UTF-8?q?=E4=B8=94=E4=B8=BA=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flossom-ui/src/views/system/scriptMessage/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flossom-ui/src/views/system/scriptMessage/index.vue b/flossom-ui/src/views/system/scriptMessage/index.vue index 9b22506..b497ff0 100644 --- a/flossom-ui/src/views/system/scriptMessage/index.vue +++ b/flossom-ui/src/views/system/scriptMessage/index.vue @@ -221,7 +221,7 @@ - + @@ -361,6 +361,9 @@ export default { type: [ { required: true, message: "跳转类型不能为空", trigger: "blur" } ], + instrumentId: [ + { required: true, message: "请选择仪器"} + ], link: [ { required: true, message: "参数不能为空", trigger: "blur" } ], From 5b4e1c35b66a462eb6a51e1a7a7d73551239b531 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Mon, 5 Feb 2024 11:27:42 +0800 Subject: [PATCH 04/23] =?UTF-8?q?bug=EF=BC=9A=E6=A8=A1=E5=BC=8F=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E6=B7=BB=E5=8A=A0=E6=A8=A1=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=B0=81=E9=9D=A2=E4=B8=8B=E9=9D=A2=E9=9C=80?= =?UTF-8?q?=E5=8A=A0=E5=8F=AA=E8=83=BD=E4=B8=8A=E4=BC=A0jpg/png=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flossom-ui/src/views/system/mode/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/flossom-ui/src/views/system/mode/index.vue b/flossom-ui/src/views/system/mode/index.vue index 1547d32..872898e 100644 --- a/flossom-ui/src/views/system/mode/index.vue +++ b/flossom-ui/src/views/system/mode/index.vue @@ -219,6 +219,7 @@ :before-upload="beforeBannerUpload" :on-remove="handleRemoveBanner"> +
只能上传jpg/png图片
From 0b22862346035265ec7ef08d1ffe56b829b0e92b Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Mon, 5 Feb 2024 16:10:14 +0800 Subject: [PATCH 05/23] =?UTF-8?q?bug=EF=BC=9A=E4=BB=AA=E5=99=A8=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E4=BB=AA=E5=99=A8=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E9=A6=96=E6=AC=A1=E7=82=B9=E5=87=BB=E7=AC=AC=E4=B8=80=E6=9D=A1?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BC=96=E8=BE=91=EF=BC=8C=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=EF=BC=9A=E7=B3=BB=E7=BB=9F=E5=BC=82=E5=B8=B8=EF=BC=8C=E8=AF=B7?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E7=AE=A1=E7=90=86=E5=91=98=EF=BC=8C=E6=8E=A5?= =?UTF-8?q?=E7=9D=80=E5=86=8D=E7=82=B9=E5=87=BB=E7=AC=AC=E4=BA=8C=E6=9D=A1?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BC=96=E8=BE=91=EF=BC=8C=E7=82=B9=E5=87=BB?= =?UTF-8?q?X=E6=B2=A1=E5=8F=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/system/instrument/index.vue | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/flossom-ui/src/views/system/instrument/index.vue b/flossom-ui/src/views/system/instrument/index.vue index b0e3227..0445de8 100644 --- a/flossom-ui/src/views/system/instrument/index.vue +++ b/flossom-ui/src/views/system/instrument/index.vue @@ -612,7 +612,7 @@ /> - + 添加规则 @@ -684,7 +684,7 @@ - + 添加介绍 @@ -1819,18 +1819,21 @@ export default { let temp = [] for (let i = 0; i < this.form.modeIdsValue.length; i++) { let filterModeArr = this.mode.modeIdsOptions.filter( - (item) => item.id == this.form.modeIdsValue[i] + (item) => item !== undefined && this.form.modeIdsValue[i] === item.id ) - temp.push(filterModeArr[0]) + if(filterModeArr !== undefined && filterModeArr.length > 0) { + temp.push(filterModeArr[0]) + } } - this.newModeOptionList = temp + if(temp !== undefined && temp.length > 0) { + this.newModeOptionList = temp + } } }) }) }, /** 提交按钮 */ submitForm() { - console.log(this.form.modeIdsValue) this.form.nurseList = this.nurseList this.form.introduceList = this.introduceList this.$refs['form'].validate((valid) => { @@ -2162,7 +2165,6 @@ export default { }, handleNurseDelete(item) { this.nurseList.splice(item.$index, 1) - console.log('handleNurseDelete', item) }, addNurseFile(index) { this.nurseIndex = index @@ -2174,7 +2176,6 @@ export default { let files = e.target.files if (files.length) { let data = await this.commonFileUpload(files[0]) - console.log('data', data) this.nurseList[this.nurseIndex].file = data.url let type = files[0].type let isImage = this.imageFileType.some((item) => type.includes(item)) @@ -2197,7 +2198,6 @@ export default { }, handleIntroduceDelete(item) { this.introduceList.splice(item.$index, 1) - console.log('handleIntroduceDelete', item) }, addIntroduceFile(index) { this.introduceIndex = index @@ -2284,7 +2284,6 @@ export default { } }, saveInstrumentName(item) { - console.log(item) if (item.id != null) { updateRelate(item).then((response) => { this.$modal.msgSuccess('修改成功') From 74e527e1e0472a169e3a89b328097f4ee22d4c6d Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Mon, 5 Feb 2024 16:15:44 +0800 Subject: [PATCH 06/23] =?UTF-8?q?bug=EF=BC=9A=E3=80=90ID1000373=E3=80=91?= =?UTF-8?q?=20=20=20=20=20=E4=BB=AA=E5=99=A8=E7=AE=A1=E7=90=86-=E5=BA=8F?= =?UTF-8?q?=E5=88=97=E5=8F=B7=E5=88=97=E8=A1=A8=E3=80=90=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E3=80=91=E6=97=A0=E6=B3=95=E5=8D=95=E9=80=89?= =?UTF-8?q?=E6=9C=AA=E7=BB=91=E5=AE=9A=E6=88=96=E5=B7=B2=E8=A7=A3=E7=BB=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flossom-ui/src/views/system/instrumentSerial/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flossom-ui/src/views/system/instrumentSerial/index.vue b/flossom-ui/src/views/system/instrumentSerial/index.vue index 9d00595..a18c836 100644 --- a/flossom-ui/src/views/system/instrumentSerial/index.vue +++ b/flossom-ui/src/views/system/instrumentSerial/index.vue @@ -35,7 +35,7 @@ - + From f25fb65cabf8d1541940fd1f6231c0a6096e93c2 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Tue, 6 Feb 2024 10:07:38 +0800 Subject: [PATCH 07/23] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BB=AA=E5=99=A8?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/mapper/WxUserInstrumentMapper.java | 2 + .../mapper/WxUserInstrumentMapper.xml | 28 +++++++++++ .../WxUserInstrumentController.java | 20 ++++++-- .../impl/WxUserInstrumentServiceImpl.java | 47 +------------------ .../src/views/system/userInstrument/index.vue | 2 +- 5 files changed, 47 insertions(+), 52 deletions(-) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserInstrumentMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserInstrumentMapper.java index b568f0d..2a1e7c2 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserInstrumentMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserInstrumentMapper.java @@ -66,4 +66,6 @@ public interface WxUserInstrumentMapper List selectListByUserIdAndInstrumentId(WxUserInstrument wxUserInstrument); void deleteByUserId(@Param("userId") Long userId); + + List selectListByCondition(WxUserInstrument wxUserInstrument); } diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserInstrumentMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserInstrumentMapper.xml index fc1ee18..a3ec75a 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserInstrumentMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserInstrumentMapper.xml @@ -26,6 +26,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, user_id, serial, instrument_id, instrument_name, serial_image, guarantee, guarantee_endtime, binding_status, status, create_by, create_time, update_by, update_time, remark from wx_user_instrument + +