lzq
/
njzscloud-dispose
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

master
lzq 2026-02-28 15:57:56 +08:00
parent 608b45c1f1
commit b52e506783
6 changed files with 327 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/constant/SettlementWay.java
View File

@ -11,6 +11,8 @@ import lombok.RequiredArgsConstructor;
@Getter
@RequiredArgsConstructor
public enum SettlementWay implements DictStr {
Wu("Wu", "无"),
YueJie("YueJie", "月结"),
YuE("YuE", "余额"),

7
njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/pojo/entity/ExpenseItemEntity.java
View File

@ -1,10 +1,8 @@
package com.njzscloud.dispose.finance.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler;
import com.njzscloud.dispose.common.pojo.entity.BaseEntity;
import com.njzscloud.dispose.finance.constant.ExpenseItemCategory;
import com.njzscloud.dispose.finance.constant.ExpenseStrategy;
@ -94,6 +92,11 @@ public class ExpenseItemEntity extends BaseEntity {
*/
private Long orgId;
/**
* 站点 Id
*/
private Long stationId;
/**
* 是否可用；0-->否、1-->是
*/

5
njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/service/AuthService.java
View File

@ -75,7 +75,7 @@ public class AuthService implements IAuthService {
return my(userDetail, client);
}
public UserDetail my(UserDetail userDetail, Integer client) {
private UserDetail my(UserDetail userDetail, Integer client) {
if (userDetail == null) return null;
Long userId = userDetail.getUserId();
Assert.notNull(userDetail, () -> Exceptions.exception("未查询到用户信息"));
@ -83,6 +83,7 @@ public class AuthService implements IAuthService {
List<EndpointResource> endpointResources = authMapper.selectUserEndpoint(userId);
List<IdentityInfo> identityInfoList = authMapper.selectUserIdentity(userId);
Long currentCustomerId = null;
Long currentOrgId = null;
MoneyAccountEntity moneyAccount = moneyAccountMapper.selectOne(Wrappers.<MoneyAccountEntity>lambdaQuery()
.eq(MoneyAccountEntity::getUserId, userId)
.eq(MoneyAccountEntity::getDeleted, Boolean.FALSE));
@ -90,6 +91,7 @@ public class AuthService implements IAuthService {
if (CollUtil.isNotEmpty(identityInfoList)) {
IdentityInfo identityInfo = identityInfoList.getFirst();
currentCustomerId = identityInfo.getCustomerId();
currentOrgId = identityInfo.getOrgId();
}
Set<String> roles = authMapper.selectRole(userId);
roles.add(ROLE_AUTHENTICATED);
@ -98,6 +100,7 @@ public class AuthService implements IAuthService {
.setRecharge(moneyAccount == null ? BigDecimal.ZERO : moneyAccount.getRecharge())
.setRevenue(moneyAccount == null ? BigDecimal.ZERO : moneyAccount.getRevenue())
.setCurrentCustomerId(currentCustomerId)
.setCurrentOrgId(currentOrgId)
.setIdentities(identityInfoList)
.setMenus(menuResources)
.setEndpoints(endpointResources)

2
njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/controller/MenuController.java
View File

@ -74,7 +74,7 @@ public class MenuController {
/**
* 分页查询
*/
@GetMapping("/page_list")
@GetMapping("/paging")
public R<PageResult<MenuDetailResult>> paging(PageParam pageParam, MenuSearchParam menuSearchParam) {
return R.success(menuService.paging(pageParam, menuSearchParam));
}

1
njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/UserModifyParam.java
View File

@ -23,6 +23,7 @@ public class UserModifyParam {
* 头像
*/
private String avatar;
private String phone;
/**
* 性别; 字典代码：gender

324
z-doc/pdma/njzscloud-dispose.pdma
View File

@ -3347,44 +3347,49 @@
"orderValue": 4
},
{
"refObjectId": "DF643AC9-1A78-408B-9F20-9C659BC475FA",
"refObjectId": "E2AC3332-9822-41A4-8BAF-EB52CCC4F26C",
"refObjectType": "P",
"orderValue": 5
},
{
"refObjectId": "718C57B0-4799-48E1-8651-57527A3BFF8B",
"refObjectId": "DF643AC9-1A78-408B-9F20-9C659BC475FA",
"refObjectType": "P",
"orderValue": 6
},
{
"refObjectId": "3A0C2179-8576-40CB-8A4D-647318E432BC",
"refObjectId": "718C57B0-4799-48E1-8651-57527A3BFF8B",
"refObjectType": "P",
"orderValue": 7
},
{
"refObjectId": "F13139EC-3554-4C1E-8C09-1A6C238C539A",
"refObjectId": "3A0C2179-8576-40CB-8A4D-647318E432BC",
"refObjectType": "P",
"orderValue": 8
},
{
"refObjectId": "F573B178-BE6E-48AB-8AF0-6121E7320EB9",
"refObjectId": "F13139EC-3554-4C1E-8C09-1A6C238C539A",
"refObjectType": "P",
"orderValue": 9
},
{
"refObjectId": "14DAB3C1-5814-401B-AC62-E15036FE31F6",
"refObjectId": "F573B178-BE6E-48AB-8AF0-6121E7320EB9",
"refObjectType": "P",
"orderValue": 10
},
{
"refObjectId": "38B910DC-4D79-448E-9EA4-CED1E92B03DE",
"refObjectId": "14DAB3C1-5814-401B-AC62-E15036FE31F6",
"refObjectType": "P",
"orderValue": 11
},
{
"refObjectId": "7B09A315-2996-4455-8893-EE3FC4EE6957",
"refObjectId": "38B910DC-4D79-448E-9EA4-CED1E92B03DE",
"refObjectType": "P",
"orderValue": 12
},
{
"refObjectId": "7B09A315-2996-4455-8893-EE3FC4EE6957",
"refObjectType": "P",
"orderValue": 13
}
],
"diagramRefs": [],
@ -3682,6 +3687,11 @@
"refObjectId": "7B09A315-2996-4455-8893-EE3FC4EE6957",
"refObjectType": "P",
"orderValue": 58
},
{
"refObjectId": "E2AC3332-9822-41A4-8BAF-EB52CCC4F26C",
"refObjectType": "P",
"orderValue": 59
}
],
"diagramRefs": []
@ -19462,6 +19472,52 @@
"attr20": "",
"origin": "UI"
},
{
"id": "2DEBF392-95DE-412C-A1EE-2BDA995C77DA",
"defKey": "station_id",
"defName": "归属站点 Id",
"intro": "",
"baseDataType": "BIGINT",
"bizDomainType": "",
"dbDataType": "BIGINT",
"dataLen": "",
"numScale": "",
"primaryKey": 0,
"notNull": 1,
"autoIncrement": 0,
"defaultValue": "",
"stndDictId": "",
"stndFieldId": "",
"stndDictKey": "",
"stndFieldKey": "",
"stndComplianceLevel": "",
"stndComplianceType": "",
"dictFrom": "",
"dictItems": null,
"fieldTier": "",
"mark": null,
"attr1": "",
"attr2": "",
"attr3": "",
"attr4": "",
"attr5": "",
"attr6": "",
"attr7": "",
"attr8": "",
"attr9": "",
"attr10": "",
"attr11": "",
"attr12": "",
"attr13": "",
"attr14": "",
"attr15": "",
"attr16": "",
"attr17": "",
"attr18": "",
"attr19": "",
"attr20": "",
"origin": "UI"
},
{
"id": "DF43F70D-82A3-4F25-94E5-46F13E6B94E6",
"defKey": "goods_id",
@ -22660,6 +22716,13 @@
"stndComplianceType": "",
"dictFrom": "Manual",
"dictItems": [
{
"itemKey": "Wu",
"itemName": "无",
"parentKey": "",
"intro": "",
"id": "0B9BB33E-D77A-44DE-B6FA-880B5F762C70"
},
{
"itemKey": "YueJie",
"itemName": "月结",
@ -41548,13 +41611,254 @@
],
"indexes": [],
"origin": "PASTE"
},
{
"id": "E2AC3332-9822-41A4-8BAF-EB52CCC4F26C",
"schemaName": null,
"defKey": "cst_station_member",
"defName": "站点成员",
"intro": "",
"type": "P",
"fields": [
{
"id": "D7F26431-AFA5-44EA-9C14-FA15BB19A419",
"defKey": "id",
"defName": "Id",
"intro": "",
"baseDataType": "BIGINT",
"bizDomainType": "",
"dbDataType": "BIGINT",
"dataLen": "",
"numScale": "",
"primaryKey": 1,
"notNull": 1,
"autoIncrement": 0,
"defaultValue": "",
"stndDictId": "",
"stndFieldId": "",
"stndDictKey": "",
"stndFieldKey": "",
"stndComplianceLevel": "",
"stndComplianceType": "",
"dictFrom": "",
"dictItems": [],
"fieldTier": "",
"mark": null,
"attr1": "",
"attr2": "",
"attr3": "",
"attr4": "",
"attr5": "",
"attr6": "",
"attr7": "",
"attr8": "",
"attr9": "",
"attr10": "",
"attr11": "",
"attr12": "",
"attr13": "",
"attr14": "",
"attr15": "",
"attr16": "",
"attr17": "",
"attr18": "PDManer",
"attr19": "",
"attr20": "",
"origin": "PASTE"
},
{
"id": "2EE05E9A-1659-48C7-8F56-7B9E7A2F3790",
"defKey": "user_id",
"defName": "用户 Id",
"intro": "",
"baseDataType": "BIGINT",
"bizDomainType": "",
"dbDataType": "BIGINT",
"dataLen": "",
"numScale": "",
"primaryKey": 0,
"notNull": 1,
"autoIncrement": 0,
"defaultValue": "",
"stndDictId": "",
"stndFieldId": "",
"stndDictKey": "",
"stndFieldKey": "",
"stndComplianceLevel": "",
"stndComplianceType": "",
"dictFrom": "",
"dictItems": null,
"fieldTier": "",
"mark": null,
"attr1": "",
"attr2": "",
"attr3": "",
"attr4": "",
"attr5": "",
"attr6": "",
"attr7": "",
"attr8": "",
"attr9": "",
"attr10": "",
"attr11": "",
"attr12": "",
"attr13": "",
"attr14": "",
"attr15": "",
"attr16": "",
"attr17": "",
"attr18": "",
"attr19": "",
"attr20": "",
"origin": "PASTE"
},
{
"id": "BD5CCA0A-7DC7-4742-9D55-A855ABDF1226",
"defKey": "customer_id",
"defName": "客户 Id",
"intro": "",
"baseDataType": "BIGINT",
"bizDomainType": "",
"dbDataType": "BIGINT",
"dataLen": "",
"numScale": "",
"primaryKey": 0,
"notNull": 1,
"autoIncrement": 0,
"defaultValue": "",
"stndDictId": "",
"stndFieldId": "",
"stndDictKey": "",
"stndFieldKey": "",
"stndComplianceLevel": "",
"stndComplianceType": "",
"dictFrom": "",
"dictItems": null,
"fieldTier": "",
"mark": null,
"attr1": "",
"attr2": "",
"attr3": "",
"attr4": "",
"attr5": "",
"attr6": "",
"attr7": "",
"attr8": "",
"attr9": "",
"attr10": "",
"attr11": "",
"attr12": "",
"attr13": "",
"attr14": "",
"attr15": "",
"attr16": "",
"attr17": "",
"attr18": "",
"attr19": "",
"attr20": "",
"origin": "PASTE"
},
{
"id": "C966C0F7-71C3-421A-A891-66826A99B701",
"defKey": "org_id",
"defName": "组织 Id",
"intro": "",
"baseDataType": "BIGINT",
"bizDomainType": "",
"dbDataType": "BIGINT",
"dataLen": "",
"numScale": "",
"primaryKey": 0,
"notNull": 1,
"autoIncrement": 0,
"defaultValue": "",
"stndDictId": "",
"stndFieldId": "",
"stndDictKey": "",
"stndFieldKey": "",
"stndComplianceLevel": "",
"stndComplianceType": "",
"dictFrom": "",
"dictItems": null,
"fieldTier": "",
"mark": null,
"attr1": "",
"attr2": "",
"attr3": "",
"attr4": "",
"attr5": "",
"attr6": "",
"attr7": "",
"attr8": "",
"attr9": "",
"attr10": "",
"attr11": "",
"attr12": "",
"attr13": "",
"attr14": "",
"attr15": "",
"attr16": "",
"attr17": "",
"attr18": "",
"attr19": "",
"attr20": "",
"origin": "PASTE"
},
{
"id": "68D531CC-C800-43E6-A8FA-53BB74E41C6D",
"defKey": "station_id",
"defName": "站点 Id",
"intro": "",
"baseDataType": "BIGINT",
"bizDomainType": "",
"dbDataType": "BIGINT",
"dataLen": "",
"numScale": "",
"primaryKey": 0,
"notNull": 1,
"autoIncrement": 0,
"defaultValue": "",
"stndDictId": "",
"stndFieldId": "",
"stndDictKey": "",
"stndFieldKey": "",
"stndComplianceLevel": "",
"stndComplianceType": "",
"dictFrom": "",
"dictItems": null,
"fieldTier": "",
"mark": null,
"attr1": "",
"attr2": "",
"attr3": "",
"attr4": "",
"attr5": "",
"attr6": "",
"attr7": "",
"attr8": "",
"attr9": "",
"attr10": "",
"attr11": "",
"attr12": "",
"attr13": "",
"attr14": "",
"attr15": "",
"attr16": "",
"attr17": "",
"attr18": "",
"attr19": "",
"attr20": "",
"origin": "PASTE"
}
],
"indexes": []
}
],
"diagrams": [],
"readonly": false,
"allowWs": false
},
"updateTime": 1769681546984,
"signature": "801934446dd8a6c05883f69ae8bcc081",
"updateTime": 1772157612371,
"signature": "1d75ec8e295700be8f58198dab84523e",
"branchId": "1111"
}