From 41ab299602d13d8da4eb6d04f0b4ab0f8b21022d Mon Sep 17 00:00:00 2001
From: feng <18691763612@163.com>
Date: Wed, 4 Feb 2026 17:14:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BE=AE=E6=9C=8D=E5=8A=A1=E5=81=A5?=
=?UTF-8?q?=E5=BA=B7=E9=93=B6=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
health-bank/health-bank-api/pom.xml | 61 +++++++++++++++
.../renkang/bank/model/po/UserDiyAppMenu.java | 51 ++++++++++++
health-bank/health-bank-biz/pom.xml | 65 ++++++++++++++++
health-bank/health-bank-start/pom.xml | 77 +++++++++++++++++++
.../org/jeecg/JeecgHealthBankApplication.java | 15 ++++
.../health-bank-start/src/main/resources/.env | 11 +++
.../src/main/resources/application.yml | 28 +++++++
health-bank/pom.xml | 28 +++++++
health-system-boms/pom.xml | 13 ++++
.../watch/service/impl/WatchServiceImpl.java | 3 +
pom.xml | 1 +
11 files changed, 353 insertions(+)
create mode 100644 health-bank/health-bank-api/pom.xml
create mode 100644 health-bank/health-bank-api/src/main/java/com/renkang/bank/model/po/UserDiyAppMenu.java
create mode 100644 health-bank/health-bank-biz/pom.xml
create mode 100644 health-bank/health-bank-start/pom.xml
create mode 100644 health-bank/health-bank-start/src/main/java/org/jeecg/JeecgHealthBankApplication.java
create mode 100644 health-bank/health-bank-start/src/main/resources/.env
create mode 100644 health-bank/health-bank-start/src/main/resources/application.yml
create mode 100644 health-bank/pom.xml
diff --git a/health-bank/health-bank-api/pom.xml b/health-bank/health-bank-api/pom.xml
new file mode 100644
index 0000000..4f3dedd
--- /dev/null
+++ b/health-bank/health-bank-api/pom.xml
@@ -0,0 +1,61 @@
+
+
+ 4.0.0
+
+ health-bank
+ com.renkang
+ 2.0.0
+
+
+ health-bank-api
+
+
+ 8
+ 8
+ UTF-8
+
+
+
+
+ org.springframework.cloud
+ spring-cloud-starter-openfeign
+
+
+
+ org.bouncycastle
+ bcpkix-jdk18on
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-sentinel
+
+
+ org.jeecgframework.boot
+ jeecg-boot-base-core
+
+
+ com.github.pagehelper
+ pagehelper
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+ ${maven-source-plugin.version}
+
+
+ attach-sources
+
+ jar
+
+
+
+
+
+
+
diff --git a/health-bank/health-bank-api/src/main/java/com/renkang/bank/model/po/UserDiyAppMenu.java b/health-bank/health-bank-api/src/main/java/com/renkang/bank/model/po/UserDiyAppMenu.java
new file mode 100644
index 0000000..9528abc
--- /dev/null
+++ b/health-bank/health-bank-api/src/main/java/com/renkang/bank/model/po/UserDiyAppMenu.java
@@ -0,0 +1,51 @@
+package com.renkang.bank.model.po;
+
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.ibatis.type.JdbcType;
+import org.jeecg.config.mybatis.FastjsonArrayTypeHandler;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(title = "APP用户自定义首页菜单设置", description = "APP用户自定义首页菜单设置")
+public class UserDiyAppMenu {
+ private static final long serialVersionUID = 1L;
+
+ @TableId(type = IdType.ASSIGN_ID)
+ @Schema(title = "id")
+ @JsonFormat(shape = JsonFormat.Shape.STRING)
+ private Long id;
+
+ @Schema(title = "用户ID")
+ private String userId;
+
+ @Schema(title = "用户自定义的菜单设置")
+ @TableField(value = "diy_menu", jdbcType = JdbcType.VARCHAR, typeHandler = FastjsonArrayTypeHandler.class)
+ private JSONArray diyMenu;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Schema(title = "首次设置时间")
+ private Date createTime;
+
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Schema(title = "最后修改时间")
+ private Date lastModifyDate;
+
+ public UserDiyAppMenu(String userId) {
+ this.userId = userId;
+ this.createTime = new Date();
+ }
+}
diff --git a/health-bank/health-bank-biz/pom.xml b/health-bank/health-bank-biz/pom.xml
new file mode 100644
index 0000000..38d2b68
--- /dev/null
+++ b/health-bank/health-bank-biz/pom.xml
@@ -0,0 +1,65 @@
+
+
+ 4.0.0
+
+ health-bank
+ com.renkang
+ 2.0.0
+
+
+ health-bank-biz
+
+
+
+ com.renkang
+ health-bank-api
+
+
+
+ org.jeecgframework.boot
+ jeecg-boot-starter-lock
+
+
+
+ com.belerweb
+ pinyin4j
+ 2.5.1
+
+
+ org.jeecgframework.boot
+ jeecg-boot-starter-job
+
+
+ com.renkang
+ renkang-starter-aspose-word
+
+
+ com.renkang
+ font-resources
+
+
+ org.jeecgframework.boot
+ jeecg-system-cloud-api
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+ ${maven-source-plugin.version}
+
+
+ attach-sources
+
+ jar
+
+
+
+
+
+
+
diff --git a/health-bank/health-bank-start/pom.xml b/health-bank/health-bank-start/pom.xml
new file mode 100644
index 0000000..6c162bd
--- /dev/null
+++ b/health-bank/health-bank-start/pom.xml
@@ -0,0 +1,77 @@
+
+
+ 4.0.0
+
+ health-bank
+ com.renkang
+ 2.0.0
+
+
+ health-bank-start
+
+
+
+
+
+ org.jeecgframework.boot
+ jeecg-boot-starter-cloud
+
+
+ com.renkang
+ health-bank-biz
+
+
+
+
+
+ ${project.artifactId}
+
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+
+ true
+
+
+
+
+
+
+ default
+
+ true
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+
+
+ divide-package
+
+ false
+
+
+ org.jeecg.JeecgHealthBankApplication
+
+
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+
+
+
+
diff --git a/health-bank/health-bank-start/src/main/java/org/jeecg/JeecgHealthBankApplication.java b/health-bank/health-bank-start/src/main/java/org/jeecg/JeecgHealthBankApplication.java
new file mode 100644
index 0000000..b662304
--- /dev/null
+++ b/health-bank/health-bank-start/src/main/java/org/jeecg/JeecgHealthBankApplication.java
@@ -0,0 +1,15 @@
+package org.jeecg;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@SpringBootApplication(scanBasePackages = {"com.renkang", "org.jeecg"})
+@EnableFeignClients(basePackages = {"org.jeecg", "com.renkang"})
+@EnableScheduling
+public class JeecgHealthBankApplication {
+ public static void main(String[] args) {
+ SpringApplication.run(JeecgHealthBankApplication.class, args);
+ }
+}
diff --git a/health-bank/health-bank-start/src/main/resources/.env b/health-bank/health-bank-start/src/main/resources/.env
new file mode 100644
index 0000000..fc92bbc
--- /dev/null
+++ b/health-bank/health-bank-start/src/main/resources/.env
@@ -0,0 +1,11 @@
+PROFILE_NAME=dev
+SERVER_PORT=7024
+NACOS_SERVER_ADDR=localhost:8848
+#NACOS_SERVER_ADDR=localhost:8848
+NACOS_USERNAME=nacos
+NACOS_PASSWORD=nacos
+NACOS_NAMESPACE=f3f65fb2-303b-4bf7-bccb-4755886503c1
+NACOS_GROUP=dev
+#DB_NAME=cqyt_system
+#REDIS_DB=10
+FILE_SERVER_URL=http://fileserver.yg.dt.io
\ No newline at end of file
diff --git a/health-bank/health-bank-start/src/main/resources/application.yml b/health-bank/health-bank-start/src/main/resources/application.yml
new file mode 100644
index 0000000..41a87dd
--- /dev/null
+++ b/health-bank/health-bank-start/src/main/resources/application.yml
@@ -0,0 +1,28 @@
+server:
+ port: ${SERVER_PORT:7024}
+spring:
+ application:
+ name: health-bank
+ config:
+ import:
+ - optional:nacos:jeecg.yaml
+ - optional:nacos:${spring.application.name}-${PROFILE_NAME}.yaml
+ cloud:
+ nacos:
+ server-addr: ${NACOS_SERVER_ADDR}
+ username: ${NACOS_USERNAME:nacos}
+ password: ${NACOS_PASSWORD:nacos}
+ config:
+ enabled: true
+ namespace: ${NACOS_NAMESPACE:}
+ group: ${NACOS_GROUP:DEFAULT_GROUP}
+ server-addr: ${spring.cloud.nacos.server-addr}
+ username: ${spring.cloud.nacos.username}
+ password: ${spring.cloud.nacos.password}
+ discovery:
+ enabled: true
+ namespace: ${NACOS_NAMESPACE:}
+ group: ${NACOS_GROUP:DEFAULT_GROUP}
+ server-addr: ${spring.cloud.nacos.server-addr}
+ username: ${spring.cloud.nacos.username}
+ password: ${spring.cloud.nacos.password}
diff --git a/health-bank/pom.xml b/health-bank/pom.xml
new file mode 100644
index 0000000..8f4230a
--- /dev/null
+++ b/health-bank/pom.xml
@@ -0,0 +1,28 @@
+
+
+
+
+ org.jeecgframework.boot
+ jeecg-boot-parent
+ 4.0
+
+
+ 4.0.0
+ health-bank
+ com.renkang
+ 2.0.0
+ pom
+
+
+ health-bank-api
+ health-bank-biz
+ health-bank-start
+
+
+
+ true
+
+
+
diff --git a/health-system-boms/pom.xml b/health-system-boms/pom.xml
index c95a0b3..2f5043c 100644
--- a/health-system-boms/pom.xml
+++ b/health-system-boms/pom.xml
@@ -66,6 +66,19 @@
health-watch-biz
${renkang.version}
+
+
+
+ com.renkang
+ health-bank-api
+ ${renkang.version}
+
+
+ com.renkang
+ health-bank-biz
+ ${renkang.version}
+
+
com.renkang
diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchServiceImpl.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchServiceImpl.java
index 205b1bf..9edd57f 100644
--- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchServiceImpl.java
+++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchServiceImpl.java
@@ -523,6 +523,9 @@ public class WatchServiceImpl implements IWatchService {
sleepData = new WatchH5IndexItemNewVo();
}
sleepData.fieldCopy(watchH5IndexItemVo);
+ if(StrUtil.isEmpty(sleepData.getDataValue())){
+ sleepData.setDataValue("0");
+ }
list.add(sleepData);
break;
case "steps":
diff --git a/pom.xml b/pom.xml
index 40dd934..1598a6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,6 +107,7 @@
health-im
health-watch
functional-modules
+ health-bank