diff --git a/wm-mobile-app/pom.xml b/wm-mobile-app/pom.xml new file mode 100644 index 00000000..caff47fc --- /dev/null +++ b/wm-mobile-app/pom.xml @@ -0,0 +1,45 @@ + + + 4.0.0 + com.waterwm-parent1.0.0-SNAPSHOT + wm-mobile-app + wm-mobile-app + 移动APP三合一后端服务层 - 供水/巡检/营业收费统一入口 + + + com.waterwm-common + + + org.springframework.bootspring-boot-starter-web + + + com.alibaba.cloudspring-cloud-starter-alibaba-nacos-discovery + + + com.baomidoumybatis-plus-spring-boot3-starter + + + cn.dev33sa-token-spring-boot3-starter + + + org.postgresqlpostgresql + + + com.github.xiaoyminknife4j-openapi3-jakarta-spring-boot-starter + + + org.springframework.bootspring-boot-starter-testtest + + + + + + org.springframework.boot + spring-boot-maven-plugin + org.projectlomboklombok + + + + diff --git a/wm-mobile-app/src/main/java/com/water/mobile/MobileApplication.java b/wm-mobile-app/src/main/java/com/water/mobile/MobileApplication.java new file mode 100644 index 00000000..293d82c1 --- /dev/null +++ b/wm-mobile-app/src/main/java/com/water/mobile/MobileApplication.java @@ -0,0 +1,16 @@ +package com.water.mobile; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; + +@SpringBootApplication +@ComponentScan(basePackages = {"com.water.mobile", "com.water.common"}) +@MapperScan("com.water.mobile.mapper") +public class MobileApplication { + + public static void main(String[] args) { + SpringApplication.run(MobileApplication.class, args); + } +} diff --git a/wm-mobile-app/src/main/java/com/water/mobile/controller/MobileController.java b/wm-mobile-app/src/main/java/com/water/mobile/controller/MobileController.java new file mode 100644 index 00000000..a334479e --- /dev/null +++ b/wm-mobile-app/src/main/java/com/water/mobile/controller/MobileController.java @@ -0,0 +1,20 @@ +package com.water.mobile.controller; +import com.water.common.core.result.R; +import com.water.mobile.entity.PushNotification; +import com.water.mobile.service.MobileApiService; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import java.util.*; +@Tag(name="移动APP") @RestController @RequestMapping("/mobile") @RequiredArgsConstructor +public class MobileController { + private final MobileApiService svc; + @PostMapping("/login") public R> login(@RequestParam String username, @RequestParam String password, @RequestParam String appModule) { return R.ok(svc.login(username, password, appModule)); } + @GetMapping("/water/overview") public R> waterOverview() { return R.ok(svc.getWaterOverview()); } + @GetMapping("/patrol/tasks") public R>> patrolTasks(@RequestParam Long userId) { return R.ok(svc.getPatrolTasks(userId)); } + @GetMapping("/billing/summary") public R> billingSummary(@RequestParam Long userId) { return R.ok(svc.getBillingSummary(userId)); } + @GetMapping("/notifications") public R> notifications(@RequestParam Long userId, @RequestParam(required=false) Boolean unreadOnly) { return R.ok(svc.getNotifications(userId, unreadOnly)); } + @PutMapping("/notifications/{id}/read") public R markRead(@PathVariable Long id) { svc.markRead(id); return R.ok("OK"); } + @PostMapping("/notifications/send") public R send(@RequestParam Long userId, @RequestParam String title, @RequestParam String content, @RequestParam String type, @RequestParam String appModule) { return R.ok(svc.sendNotification(userId, title, content, type, appModule)); } + @GetMapping("/update/check") public R> checkUpdate(@RequestParam String appModule, @RequestParam String currentVersion) { return R.ok(svc.checkUpdate(appModule, currentVersion)); } +} diff --git a/wm-mobile-app/src/main/java/com/water/mobile/entity/AppVersion.java b/wm-mobile-app/src/main/java/com/water/mobile/entity/AppVersion.java new file mode 100644 index 00000000..f62f6507 --- /dev/null +++ b/wm-mobile-app/src/main/java/com/water/mobile/entity/AppVersion.java @@ -0,0 +1,11 @@ +package com.water.mobile.entity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; import java.time.LocalDateTime; +@Data @TableName("mobile_app_version") +public class AppVersion { + @TableId(type = IdType.AUTO) private Long id; + private String appModule, versionNo, downloadUrl, changelog; + private Integer forceUpdate; // 0否 1是 + private Integer status; // 0草稿 1已发布 + @TableField(fill=FieldFill.INSERT) private LocalDateTime createdTime; +} diff --git a/wm-mobile-app/src/main/java/com/water/mobile/entity/MobileUser.java b/wm-mobile-app/src/main/java/com/water/mobile/entity/MobileUser.java new file mode 100644 index 00000000..38c66d48 --- /dev/null +++ b/wm-mobile-app/src/main/java/com/water/mobile/entity/MobileUser.java @@ -0,0 +1,13 @@ +package com.water.mobile.entity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; import java.time.LocalDateTime; +@Data @TableName("mobile_user") +public class MobileUser { + @TableId(type = IdType.AUTO) private Long id; + private String username, password, realName, phone, avatar; + private String appModule; // 供水/巡检/收费 + private Long sysUserId; // 关联系统用户ID + private Integer status; + @TableField(fill=FieldFill.INSERT) private LocalDateTime createdTime; + private LocalDateTime lastLoginTime; +} diff --git a/wm-mobile-app/src/main/java/com/water/mobile/entity/PushNotification.java b/wm-mobile-app/src/main/java/com/water/mobile/entity/PushNotification.java new file mode 100644 index 00000000..46588db6 --- /dev/null +++ b/wm-mobile-app/src/main/java/com/water/mobile/entity/PushNotification.java @@ -0,0 +1,12 @@ +package com.water.mobile.entity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; import java.time.LocalDateTime; +@Data @TableName("mobile_push_notification") +public class PushNotification { + @TableId(type = IdType.AUTO) private Long id; + private Long userId; private String title, content, type; + private String appModule; // 供水/巡检/收费/系统 + private Integer isRead; // 0未读 1已读 + private String extraData; + @TableField(fill=FieldFill.INSERT) private LocalDateTime createdTime; +} diff --git a/wm-mobile-app/src/main/java/com/water/mobile/mapper/AppVersionMapper.java b/wm-mobile-app/src/main/java/com/water/mobile/mapper/AppVersionMapper.java new file mode 100644 index 00000000..2ce3df38 --- /dev/null +++ b/wm-mobile-app/src/main/java/com/water/mobile/mapper/AppVersionMapper.java @@ -0,0 +1,5 @@ +package com.water.mobile.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.water.mobile.entity.AppVersion; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface AppVersionMapper extends BaseMapper {} diff --git a/wm-mobile-app/src/main/java/com/water/mobile/mapper/MobileUserMapper.java b/wm-mobile-app/src/main/java/com/water/mobile/mapper/MobileUserMapper.java new file mode 100644 index 00000000..6887b97c --- /dev/null +++ b/wm-mobile-app/src/main/java/com/water/mobile/mapper/MobileUserMapper.java @@ -0,0 +1,5 @@ +package com.water.mobile.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.water.mobile.entity.MobileUser; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface MobileUserMapper extends BaseMapper {} diff --git a/wm-mobile-app/src/main/java/com/water/mobile/mapper/PushNotificationMapper.java b/wm-mobile-app/src/main/java/com/water/mobile/mapper/PushNotificationMapper.java new file mode 100644 index 00000000..481ecd0e --- /dev/null +++ b/wm-mobile-app/src/main/java/com/water/mobile/mapper/PushNotificationMapper.java @@ -0,0 +1,5 @@ +package com.water.mobile.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.water.mobile.entity.PushNotification; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface PushNotificationMapper extends BaseMapper {} diff --git a/wm-mobile-app/src/main/java/com/water/mobile/service/MobileApiService.java b/wm-mobile-app/src/main/java/com/water/mobile/service/MobileApiService.java new file mode 100644 index 00000000..f8f70b8d --- /dev/null +++ b/wm-mobile-app/src/main/java/com/water/mobile/service/MobileApiService.java @@ -0,0 +1,72 @@ +package com.water.mobile.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.water.mobile.entity.*; +import com.water.mobile.mapper.*; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import java.util.*; +@Service @RequiredArgsConstructor +public class MobileApiService { + private final MobileUserMapper userMapper; + private final PushNotificationMapper pushMapper; + private final AppVersionMapper verMapper; + + public Map login(String username, String password, String appModule) { + MobileUser u = userMapper.selectOne(new LambdaQueryWrapper() + .eq(MobileUser::getUsername, username) + .eq(MobileUser::getAppModule, appModule)); + if (u == null || !u.getPassword().equals(password)) throw new RuntimeException("登录失败"); + return Map.of("userId", u.getId(), "realName", u.getRealName(), + "appModule", u.getAppModule(), "token", "mock-token-" + u.getId()); + } + // 供水API聚合 + public Map getWaterOverview() { + return Map.of("todaySupply", 12500.0, "yesterdaySupply", 11800.0, + "waterQuality", "合格", "alertCount", 3, "deviceOnlineRate", 0.95); + } + // 巡检API聚合 + public List> getPatrolTasks(Long userId) { + return List.of( + Map.of("id", 1L, "taskName", "主管网巡检A线", "status", "待执行", "deadline", "今日18:00"), + Map.of("id", 2L, "taskName", "消防栓检查-区域B", "status", "进行中", "deadline", "今日17:00") + ); + } + // 收费API聚合 + public Map getBillingSummary(Long userId) { + return Map.of("unpaidCount", 2, "totalAmount", 156.80, + "recentBills", List.of( + Map.of("period", "2025-01", "amount", 78.40, "status", "未缴费"), + Map.of("period", "2024-12", "amount", 82.50, "status", "已缴费") + )); + } + // 消息通知 + public List getNotifications(Long userId, Boolean unreadOnly) { + LambdaQueryWrapper w = new LambdaQueryWrapper() + .eq(PushNotification::getUserId, userId); + if (Boolean.TRUE.equals(unreadOnly)) w.eq(PushNotification::getIsRead, 0); + return pushMapper.selectList(w.orderByDesc(PushNotification::getCreatedTime)); + } + public void markRead(Long notificationId) { + PushNotification n = pushMapper.selectById(notificationId); + if (n != null) { n.setIsRead(1); pushMapper.updateById(n); } + } + public Long sendNotification(Long userId, String title, String content, String type, String appModule) { + PushNotification n = new PushNotification(); + n.setUserId(userId); n.setTitle(title); n.setContent(content); + n.setType(type); n.setAppModule(appModule); n.setIsRead(0); + pushMapper.insert(n); + return n.getId(); + } + // 版本检查 + public Map checkUpdate(String appModule, String currentVersion) { + AppVersion v = verMapper.selectOne(new LambdaQueryWrapper() + .eq(AppVersion::getAppModule, appModule) + .eq(AppVersion::getStatus, 1) + .orderByDesc(AppVersion::getCreatedTime).last("LIMIT 1")); + if (v == null || v.getVersionNo().equals(currentVersion)) + return Map.of("hasUpdate", false); + return Map.of("hasUpdate", true, "versionNo", v.getVersionNo(), + "downloadUrl", v.getDownloadUrl(), "changelog", v.getChangelog(), + "forceUpdate", v.getForceUpdate() == 1); + } +} diff --git a/wm-mobile-app/src/main/resources/application.yml b/wm-mobile-app/src/main/resources/application.yml new file mode 100644 index 00000000..f8de5d73 --- /dev/null +++ b/wm-mobile-app/src/main/resources/application.yml @@ -0,0 +1,15 @@ +server: + port: 9060 +spring: + application: + name: wm-mobile-app + datasource: + url: jdbc:postgresql://localhost:5432/water_mobile + username: water + password: water123 +mybatis-plus: + configuration: + map-underscore-to-camel-case: true + global-config: + db-config: + id-type: auto diff --git a/wm-mobile-app/src/main/resources/db/V1__mobile_app.sql b/wm-mobile-app/src/main/resources/db/V1__mobile_app.sql new file mode 100644 index 00000000..8197459a --- /dev/null +++ b/wm-mobile-app/src/main/resources/db/V1__mobile_app.sql @@ -0,0 +1,18 @@ +CREATE TABLE IF NOT EXISTS mobile_user ( + id BIGSERIAL PRIMARY KEY, username VARCHAR(50), password VARCHAR(200), + real_name VARCHAR(50), phone VARCHAR(20), avatar VARCHAR(500), + app_module VARCHAR(20), sys_user_id BIGINT, status INT DEFAULT 1, + created_time TIMESTAMP DEFAULT NOW(), last_login_time TIMESTAMP +); +CREATE TABLE IF NOT EXISTS mobile_push_notification ( + id BIGSERIAL PRIMARY KEY, user_id BIGINT, title VARCHAR(200), + content TEXT, type VARCHAR(30), app_module VARCHAR(20), + is_read INT DEFAULT 0, extra_data TEXT, + created_time TIMESTAMP DEFAULT NOW() +); +CREATE TABLE IF NOT EXISTS mobile_app_version ( + id BIGSERIAL PRIMARY KEY, app_module VARCHAR(20), version_no VARCHAR(20), + download_url VARCHAR(500), changelog TEXT, + force_update INT DEFAULT 0, status INT DEFAULT 0, + created_time TIMESTAMP DEFAULT NOW() +);