dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dyf:d7c4d22de357e644e6d4a781d6050bccd0a2638c
Branches Tags
dyf:main dyf:6170 dyf:dyf-device dyf:jingquan dyf:prod dyf:APP权限登录改造
...
compare: dyf:prod
Branches Tags
dyf:6170 dyf:dyf-device dyf:jingquan dyf:prod dyf:main dyf:APP权限登录改造

27 Commits
d7c4d22de3 ... prod

Author SHA1 Message Date
daiyongfei
cde34cab6c Merge branch '6170' into prod 2025-12-26 16:22:57 +08:00
daiyongfei
dff37b245a Merge branch 'dyf-device' into 6170 2025-12-26 16:22:00 +08:00
chenyouting
6a058318f2 设备记录列表显示问题修改 2025-12-26 15:54:14 +08:00
daiyongfei
f2d74b8f17 Merge branch 'dyf-device' into 6170 2025-12-22 15:09:39 +08:00
chenyouting
aaf142ca67 提交 2025-12-19 17:55:48 +08:00
daiyongfei
7d256df790 Merge branch 'dyf-device' into prod 2025-12-19 16:22:55 +08:00
daiyongfei
3d1c2f4e56 Merge branch 'dyf-device' into prod 2025-12-19 14:08:03 +08:00
daiyongfei
ccadcb8d4e Merge branch '6170' into prod 2025-12-12 14:59:50 +08:00
daiyongfei
b8cb663bbf Merge branch 'jingquan' into prod 2025-12-03 16:56:49 +08:00
daiyongfei
56e86b070d Merge branch 'dyf-device' into prod 2025-12-01 13:33:59 +08:00
daiyongfei
0898855108 Merge branch '6170' into prod 2025-11-28 10:18:54 +08:00
daiyongfei
92b65ce6df Merge branch 'dyf-device' into prod 2025-11-27 11:01:58 +08:00
daiyongfei
82399cffed Merge branch 'dyf-device' into prod 2025-08-25 14:33:52 +08:00
daiyongfei
5538ac96e5 晶全日志配置 2025-08-06 09:48:00 +08:00
daiyongfei
b703f80355 晶全日志配置 2025-08-06 09:44:52 +08:00
daiyongfei
b3b249ea07 日志配置 2025-08-06 09:20:41 +08:00
daiyongfei
aff424e73b Merge branch 'main' into prod 2025-08-06 09:18:43 +08:00
daiyongfei
dc513a858a Merge branch 'main' into prod 2025-08-04 09:08:34 +08:00
daiyongfei
df5ce7ddd9 Merge branch 'main' into prod 2025-07-31 09:21:10 +08:00
daiyongfei
2174dfdb4d Merge branch 'main' into prod 2025-07-23 19:24:27 +08:00
daiyongfei
2800b89e06 Merge branch 'main' into prod 2025-07-23 10:55:30 +08:00
daiyongfei
637e46c510 Merge branch 'main' into prod 2025-07-21 08:40:34 +08:00
daiyongfei
31c2158c8e Merge branch 'main' into prod 2025-07-19 10:22:33 +08:00
daiyongfei
c7c21dc358 Merge branch 'main' into prod 2025-07-18 15:17:54 +08:00
daiyongfei
a7e0803b00 Merge branch 'main' into prod 2025-07-17 16:42:14 +08:00
daiyongfei
55cacbd322 Merge branch 'main' into prod 2025-07-17 09:24:45 +08:00
daiyongfei
99ec6eaff0 prod 2025-07-15 08:40:20 +08:00
6 changed files with 20 additions and 20 deletions
Expand all files Collapse all files

2
fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceShareService.java
View File

@ -227,7 +227,7 @@ public class AppDeviceShareService {
appDeviceShare.setPermission(bo.getPermission()); appDeviceShare.setPermission(bo.getPermission());
appDeviceShare.setCreateBy(userId); appDeviceShare.setCreateBy(userId);
return appDeviceShareMapper.insert(appDeviceShare); return appDeviceShareMapper.insert(appDeviceShare);
} }
} }
public int remove(Long[] ids) { public int remove(Long[] ids) {

4
fys-admin/src/main/resources/application-jingquan.yml
View File

@ -8,8 +8,8 @@ spring.boot.admin.client:
metadata: metadata:
username: ${spring.boot.admin.client.username} username: ${spring.boot.admin.client.username}
userpassword: ${spring.boot.admin.client.password} userpassword: ${spring.boot.admin.client.password}
username: @monitor.username@ username: ${monitor.username}
password: @monitor.password@ password: ${monitor.password}
--- # snail-job 配置 --- # snail-job 配置
snail-job: snail-job:

4
fys-admin/src/main/resources/application-prod.yml
View File

@ -11,8 +11,8 @@ spring.boot.admin.client:
metadata: metadata:
username: ${spring.boot.admin.client.username} username: ${spring.boot.admin.client.username}
userpassword: ${spring.boot.admin.client.password} userpassword: ${spring.boot.admin.client.password}
username: @monitor.username@ username: ${monitor.username}
password: @monitor.password@ password: ${monitor.password}
--- # snail-job 配置 --- # snail-job 配置
snail-job: snail-job:

10
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/TrackServiceController.java
View File

@ -44,7 +44,7 @@ public class TrackServiceController extends BaseController {
/** /**
* 查询轨迹服务列表 * 查询轨迹服务列表
*/ */
@SaCheckPermission("equipment:trackService:list") // @SaCheckPermission("equipment:trackService:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<TrackServiceVo> list(TrackServiceBo bo, PageQuery pageQuery) { public TableDataInfo<TrackServiceVo> list(TrackServiceBo bo, PageQuery pageQuery) {
return trackServiceService.queryPageList(bo, pageQuery); return trackServiceService.queryPageList(bo, pageQuery);
@ -53,7 +53,7 @@ public class TrackServiceController extends BaseController {
/** /**
* 轨迹服务列表 * 轨迹服务列表
*/ */
@SaCheckPermission("equipment:trackService:export") // @SaCheckPermission("equipment:trackService:export")
@Log(title = "轨迹服务", businessType = BusinessType.EXPORT) @Log(title = "轨迹服务", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(TrackServiceBo bo, HttpServletResponse response) { public void export(TrackServiceBo bo, HttpServletResponse response) {
@ -75,7 +75,7 @@ public class TrackServiceController extends BaseController {
/** /**
* 新增轨迹服务 * 新增轨迹服务
*/ */
@SaCheckPermission("equipment:trackService:add") // @SaCheckPermission("equipment:trackService:add")
@Log(title = "轨迹服务", businessType = BusinessType.INSERT) @Log(title = "轨迹服务", businessType = BusinessType.INSERT)
@PostMapping(value = "/add") @PostMapping(value = "/add")
public R<Void> add(@Validated(AddGroup.class) @RequestBody TrackServiceBo bo) { public R<Void> add(@Validated(AddGroup.class) @RequestBody TrackServiceBo bo) {
@ -85,7 +85,7 @@ public class TrackServiceController extends BaseController {
/** /**
* 修改轨迹服务 * 修改轨迹服务
*/ */
@SaCheckPermission("equipment:trackService:edit") // @SaCheckPermission("equipment:trackService:edit")
@Log(title = "轨迹服务", businessType = BusinessType.UPDATE) @Log(title = "轨迹服务", businessType = BusinessType.UPDATE)
@PostMapping(value = "/update") @PostMapping(value = "/update")
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TrackServiceBo bo) { public R<Void> edit(@Validated(EditGroup.class) @RequestBody TrackServiceBo bo) {
@ -97,7 +97,7 @@ public class TrackServiceController extends BaseController {
* *
* @param ids 主键串 * @param ids 主键串
*/ */
@SaCheckPermission("equipment:trackService:remove") // @SaCheckPermission("equipment:trackService:remove")
@Log(title = "轨迹服务", businessType = BusinessType.DELETE) @Log(title = "轨迹服务", businessType = BusinessType.DELETE)
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public R<Void> remove(@NotEmpty(message = "主键不能为空") public R<Void> remove(@NotEmpty(message = "主键不能为空")

4
fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceLogMapper.xml
View File

@ -13,8 +13,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.content, a.content,
a.create_time AS createTime a.create_time AS createTime
FROM FROM
device_log a left join device b on a.device_id = b.id device_log a inner join device b on a.device_id = b.id
left join device_type c on b.device_type = c.id inner join device_type c on b.device_type = c.id
WHERE 1 = 1 WHERE 1 = 1
<if test="bo.deviceType != null"> <if test="bo.deviceType != null">
AND c.id = #{bo.deviceType} AND c.id = #{bo.deviceType}

16
pom.xml
View File

@ -85,10 +85,10 @@
<monitor.username>fys</monitor.username> <monitor.username>fys</monitor.username>
<monitor.password>123456</monitor.password> <monitor.password>123456</monitor.password>
</properties> </properties>
<activation> <!-- <activation> -->
<!-- 默认环境 --> <!-- &lt;!&ndash; 默认环境 &ndash;&gt; -->
<activeByDefault>true</activeByDefault> <!-- <activeByDefault>true</activeByDefault> -->
</activation> <!-- </activation> -->
</profile> </profile>
<profile> <profile>
<id>prod</id> <id>prod</id>
@ -98,10 +98,10 @@
<monitor.username>fys</monitor.username> <monitor.username>fys</monitor.username>
<monitor.password>123456</monitor.password> <monitor.password>123456</monitor.password>
</properties> </properties>
<!-- <activation> --> <activation>
<!-- &lt;!&ndash; 默认环境 &ndash;&gt; --> <!-- 默认环境 -->
<!-- <activeByDefault>true</activeByDefault> --> <activeByDefault>true</activeByDefault>
<!-- </activation> --> </activation>
</profile> </profile>
<profile> <profile>
<id>jingquan</id> <id>jingquan</id>