CpopSZ/Cpop-Union
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Java8->Java17(二)

Browse Source
This commit is contained in:
DB 2024-04-23 18:24:30 +08:00
parent 69dbc94b48
commit 25773526cd
98 changed files with 1051 additions and 2457 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cpop-Core/src/main/java/com/cpop/core/strategy/dataSourceSharding/CpopDataSourceShardingStrategy.java
View File

@ -14,7 +14,7 @@ public class CpopDataSourceShardingStrategy implements DataSourceShardingStrateg
@Override @Override
public String doSharding(String currentDataSourceKey, Object mapper, Method mapperMethod, Object[] methodArgs){ public String doSharding(String currentDataSourceKey, Object mapper, Method mapperMethod, Object[] methodArgs){
// 不管 other 数据源的情况 // 不管 other 数据源的情况
if ("oam".equals(currentDataSourceKey)){ if ("jambox".equals(currentDataSourceKey)){
return currentDataSourceKey; return currentDataSourceKey;
} }
@ -22,7 +22,7 @@ public class CpopDataSourceShardingStrategy implements DataSourceShardingStrateg
/*if (StringUtils.startWithAny(mapperMethod.getName(), "insert", "delete", "update")){ /*if (StringUtils.startWithAny(mapperMethod.getName(), "insert", "delete", "update")){
return "master"; return "master";
}*/ }*/
return "jambox"; return "oam";
//其他场景，使用 slave1 或者 slave2 进行负载均衡 //其他场景，使用 slave1 或者 slave2 进行负载均衡
//return "slave"; //return "slave";
} }

2
Cpop-Core/src/main/resources/mapper/ConfigMapper.xml
View File

@ -2,6 +2,6 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jambox.core.mapper.ConfigMapper"> <mapper namespace="com.cpop.core.mapper.ConfigMapper">
</mapper> </mapper>

2
Cpop-Core/src/main/resources/mapper/OperationLogMapper.xml
View File

@ -2,6 +2,6 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jambox.core.mapper.OperationLogMapper"> <mapper namespace="com.cpop.core.mapper.OperationLogMapper">
</mapper> </mapper>

2
Cpop-Core/src/main/resources/mapper/UserMapper.xml
View File

@ -2,6 +2,6 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jambox.core.mapper.UserMapper"> <mapper namespace="com.cpop.core.mapper.UserMapper">
</mapper> </mapper>

5
Cpop-Jambox/pom.xml
View File

@ -28,11 +28,6 @@
<groupId>com.cpop</groupId> <groupId>com.cpop</groupId>
<artifactId>Cpop-Pay</artifactId> <artifactId>Cpop-Pay</artifactId>
</dependency> </dependency>
<!--微信小程序-->
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-miniapp</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>

133
Cpop-Oam/Cpop-Oam-Web/src/main/resources/application-dev.yml
View File

@ -4,7 +4,7 @@ cpop:
profile: E:/Cpop/uploadPath profile: E:/Cpop/uploadPath
jwt: jwt:
#白名单 #白名单
whiteList: /websocket/*,/login,/doc.html,/webjars/**,/favicon.ico,/v2/api-docs/**,/swagger-resources,/sysCommon/miniSyncBrandAndStore,/easyLearn/callback/*/*,/easyLearn/*,/mini/cardTemplate/*,/website/**,/backstage/wxCp/*,/callback/wxCp/*/registerCode,/callback/easyLearn/**,/cloudCallback/*,/mini/summit/* white-list: /websocket/*,/login,/doc.html,/webjars/**,/favicon.ico,/v2/api-docs/**,/swagger-resources,/sysCommon/miniSyncBrandAndStore,/easyLearn/callback/*/*,/easyLearn/*,/mini/cardTemplate/*,/website/**,/backstage/wxCp/*,/callback/wxCp/*/registerCode,/callback/easyLearn/**,/cloudCallback/*,/mini/summit/*
gateway: gateway:
rsa-keypair: rsa-keypair:
# 公钥文件 # 公钥文件
@ -16,103 +16,78 @@ cpop:
spring: spring:
application: application:
name: Cpop-Oam-Dev name: Cpop-Oam-Dev
#redis配置
redis:
#地址
host: gz-crs-lv77ii2t.sql.tencentcdb.com
#端口
port: 27714
#数据库
database: 1
#密码
password: Cpop2022@
#连接超时
timeout: 5000
jedis:
pool:
#
min-idle: 0
#
max-idle: 16
#
max-active: 16
#
max-wait: -1ms
client-type: jedis
data: data:
mongodb: #redis配置
host: localhost redis:
port: 27017 #地址
database: cpop-dev host: gz-crs-lv77ii2t.sql.tencentcdb.com
username: Cpop #端口
password: Admin@123 port: 27714
#数据库
database: 1
#密码
password: Cpop2022@
#连接超时
timeout: 5000
jedis:
pool:
min-idle: 0
max-idle: 16
max-active: 16
max-wait: -1ms
client-type: jedis
server: server:
port: 9420 port: 9420
servlet: servlet:
context-path: /Cpop-Oam context-path: /Cpop-Oam
# mongo-plus
mongo-plus:
data:
mongodb:
#ip
host: 1panel.cpopsz.com
#端口
port: 27017
#数据库名
database: jambox_dev
#用户名，没有可不填（若账号中出现@,!等等符号，不需要再进行转码！！！）
username: mongo_kBXjhm
#密码，同上（若密码中出现@,!等等符号，不需要再进行转码！！！）
password: mongo_7RF4Zj
#验证数据库 admin
authentication-database: admin
connect-timeout-m-s: 50000
#Mybatis-Flex #Mybatis-Flex
mybatis-flex: mybatis-flex:
configuration: configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
datasource: datasource:
oam: oam:
url: jdbc:mysql://localhost:3306/cpop_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://sh-cynosdbmysql-grp-fggo83js.sql.tencentcdb.com:20965/cpop_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root username: root
password: Admin@123 password: Customer0401
jambox: jambox:
url: jdbc:mysql://sh-cynosdbmysql-grp-fggo83js.sql.tencentcdb.com:20965/jambox_test?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true url: jdbc:mysql://sh-cynosdbmysql-grp-fggo83js.sql.tencentcdb.com:20965/jambox_test?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
username: root username: root
password: Customer0401 password: Customer0401
# springdoc-openapi项目配置 # springdoc-openapi项目配置
springdoc:
swagger-ui:
path: /swagger-ui.html
tags-sorter: alpha
operations-sorter: alpha
api-docs:
path: /v3/api-docs
group-configs:
- group: '系统后台'
paths-to-match: '/**'
packages-to-scan: com.cpop.oam.business.controller.backstage
# knife4j的增强配置，不需要增强可以不配
knife4j: knife4j:
enable: true enable: true
openapi: setting:
title: PuPu-OAM开发API language: zh_cn
description: PuPu-OAM开发API
email:
concat: DB
url: https://api.jamboxsys.com
version: 1.0.0
license: Apache 2.0
license-url: https://stackoverflow.com/
terms-of-service-url: https://api.jamboxsys.com
group:
#系统
Oam:
group-name: Oam
api-rule: package
api-rule-resources:
- com.cpop.oam
#系统
System:
group-name: System
api-rule: package
api-rule-resources:
- com.cpop.system
#果酱
Jambox:
group-name: Jambox
api-rule: package
api-rule-resources:
- com.cpop.jambox
#微信
wx:
pay:
# p12证书的位置，可以指定绝对路径，也可以指定类路径（以classpath:开头）
keyPath: E:/Cpop/Cpop-Union/Cpop-Core/src/main/resources/static/keyPair/wxPay_cert.p12
# 私钥证书
privateKeyPath: E:/Cpop/Cpop-Union/Cpop-Core/src/main/resources/static/keyPair/wxPay_key.pem
# 私钥文件
privateCertPath: E:/Cpop/Cpop-Union/Cpop-Core/src/main/resources/static/keyPair/wxPay_cert.pem
# 先学后付用户签约通知地址
learn-now-pay-later-user-sign-plan-notify-url: https://frp-oak.top:11899/Cpop-Oam/callback/easyLearn/learnNowPayLaterUserSignPlanNotify
# 先学后付用户核销通知地址
learn-now-pay-later-service-order-notify-url: https://frp-oak.top:11899/Cpop-Oam/callback/easyLearn/learnNowPayLaterUserSignPlanNotify
#数币
ecpp:
pay:
base-url: https://newstage.ecnyenter.com

19
Cpop-Oam/Cpop-Oam-Web/src/main/resources/application.yml
View File

@ -12,6 +12,25 @@ cpop:
# 初始化大小 # 初始化大小
keySize: 2048 keySize: 2048
############## Sa-Token 配置 (文档: https://sa-token.cc) ##############
sa-token:
# token 名称（同时也是 cookie 名称）
token-name: Authorization
# token 有效期（单位：秒） 默认30天，-1 代表永久有效
timeout: 604800
# token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
active-timeout: -1
# 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
is-concurrent: false
# 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
is-share: true
# token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
token-style: random-64
# 是否输出操作日志
is-log: true
# jwt秘钥
jwt-secret-key: asdasdasifhueuizzurfewbfjsdafjk
#Spring #Spring
spring: spring:
mvc: mvc:

9
Cpop-Oam/pom.xml
View File

@ -19,10 +19,6 @@
<groupId>com.cpop</groupId> <groupId>com.cpop</groupId>
<artifactId>Cpop-Core</artifactId> <artifactId>Cpop-Core</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.cpop</groupId>
<artifactId>Cpop-Jambox</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.cpop</groupId> <groupId>com.cpop</groupId>
<artifactId>Cpop-System</artifactId> <artifactId>Cpop-System</artifactId>
@ -45,11 +41,6 @@
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId> <artifactId>spring-test</artifactId>
</dependency> </dependency>
<!-- 打卡Demo包 -->
<dependency>
<groupId>com.cpop</groupId>
<artifactId>Cpop-ClockIn-Demo</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>

16
Cpop-Oam/src/main/java/com/cpop/oam/business/bo/ChangePlugOpenBo.java
View File

@ -1,13 +1,11 @@
package com.cpop.oam.business.bo; package com.cpop.oam.business.bo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/** /**
* @author DB * @author DB
* @version 1.0.0 * @version 1.0.0
@ -15,27 +13,27 @@ import javax.validation.constraints.NotNull;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "ChangePlugOpenBo对象") @Schema(description = "ChangePlugOpenBo对象")
public class ChangePlugOpenBo { public class ChangePlugOpenBo {
/** /**
* 校区 * 校区
*/ */
@NotBlank(message = "校区不能为空") @NotBlank(message = "校区不能为空")
@ApiModelProperty(value = "校区",required = true) @Schema(description = "校区",requiredMode = Schema.RequiredMode.REQUIRED)
private String storeId; private String storeId;
/** /**
* 插件 * 插件
*/ */
@NotBlank(message = "插件不能为空") @NotBlank(message = "插件不能为空")
@ApiModelProperty(value = "插件",required = true) @Schema(description = "插件",requiredMode = Schema.RequiredMode.REQUIRED)
private String plugTag; private String plugTag;
/** /**
* 开启与关闭 * 开启与关闭
*/ */
@NotNull(message = "开启与关闭不能为空") @NotNull(message = "开启与关闭不能为空")
@ApiModelProperty(value = "开启与关闭",required = true) @Schema(description = "开启与关闭",requiredMode = Schema.RequiredMode.REQUIRED)
private Boolean isOpen; private Boolean isOpen;
} }

53
Cpop-Oam/src/main/java/com/cpop/oam/business/bo/CloudUnionCallbackBo.java
View File

@ -1,11 +1,10 @@
package com.cpop.oam.business.bo; package com.cpop.oam.business.bo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty; import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import java.sql.Date; import java.sql.Date;
/** /**
@ -15,43 +14,43 @@ import java.sql.Date;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "CloudUnionCallbackBo对象", description = "云回调统一入参") @Schema(description = "云回调统一入参")
public class CloudUnionCallbackBo { public class CloudUnionCallbackBo {
/** /**
* 回调枚举(DATA_IMPORT_CALLBACK:数据导入回调) * 回调枚举(DATA_IMPORT_CALLBACK:数据导入回调)
*/ */
@NotBlank(message = "回调枚举不能为空") @NotBlank(message = "回调枚举不能为空")
@ApiModelProperty(value = "回调枚举(DATA_IMPORT_CALLBACK:数据导入回调;SYNC_BRAND_AND_STORE_CALLBACK:同步品牌与校区)",required = true) @Schema(description = "回调枚举(DATA_IMPORT_CALLBACK:数据导入回调;SYNC_BRAND_AND_STORE_CALLBACK:同步品牌与校区)",required = true)
private String callbackEnum; private String callbackEnum;
/** /**
* 主要id * 主要id
*/ */
@ApiModelProperty(value = "主要id") @Schema(description = "主要id")
private String mainId; private String mainId;
/** /**
* 同步品牌与校区相关参数 * 同步品牌与校区相关参数
*/ */
@ApiModelProperty(value = "同步品牌与校区相关参数") @Schema(description = "同步品牌与校区相关参数")
private SyncBrandAndStore syncBrandAndStore; private SyncBrandAndStore syncBrandAndStore;
@Data @Data
@ApiModel("同步品牌与校区") @Schema(description = "同步品牌与校区")
public class SyncBrandAndStore { public class SyncBrandAndStore {
/** /**
* 品牌 * 品牌
*/ */
@ApiModelProperty(value = "品牌") @Schema(description = "品牌")
private SyncBrandAndStoreBo.BrandInfo brandInfo; private BrandInfo brandInfo;
/** /**
* 校区 * 校区
*/ */
@ApiModelProperty(value = "校区") @Schema(description = "校区")
private SyncBrandAndStoreBo.StoreInfo storeInfo; private StoreInfo storeInfo;
/** /**
@ -63,13 +62,13 @@ public class CloudUnionCallbackBo {
/** /**
* 云品牌id * 云品牌id
*/ */
@ApiModelProperty(value = "云品牌id") @Schema(description = "云品牌id")
private String brandCloudId; private String brandCloudId;
/** /**
* 品牌名 * 品牌名
*/ */
@ApiModelProperty(value = "品牌名") @Schema(description = "品牌名")
private String brandName; private String brandName;
} }
@ -82,79 +81,79 @@ public class CloudUnionCallbackBo {
/** /**
* 云品牌id * 云品牌id
*/ */
@ApiModelProperty(value = "云校区id") @Schema(description = "云校区id")
private String storeCloudId; private String storeCloudId;
/** /**
* 店铺/校区名 * 店铺/校区名
*/ */
@ApiModelProperty(value = "店铺/校区名") @Schema(description = "店铺/校区名")
private String storeName; private String storeName;
/** /**
* 店铺/校区地址 * 店铺/校区地址
*/ */
@ApiModelProperty(value = "店铺/校区地址") @Schema(description = "店铺/校区地址")
private String storeAddr; private String storeAddr;
/** /**
* 负责人 * 负责人
*/ */
@ApiModelProperty(value = "负责人") @Schema(description = "负责人")
private String personCharge; private String personCharge;
/** /**
* 手机号 * 手机号
*/ */
@ApiModelProperty(value = "手机号") @Schema(description = "手机号")
private String phone; private String phone;
/** /**
* 营业执照地址 * 营业执照地址
*/ */
@ApiModelProperty(value = "营业执照地址") @Schema(description = "营业执照地址")
private String licenseAddr; private String licenseAddr;
/** /**
* 营业执照日期 * 营业执照日期
*/ */
@ApiModelProperty(value = "营业执照日期") @Schema(description = "营业执照日期")
private Date licenseDate; private Date licenseDate;
/** /**
* 营业执照公司名 * 营业执照公司名
*/ */
@ApiModelProperty(value = "营业执照公司名") @Schema(description = "营业执照公司名")
private String licenseName; private String licenseName;
/** /**
* 营业执照证书码 * 营业执照证书码
*/ */
@ApiModelProperty(value = "营业执照证书码") @Schema(description = "营业执照证书码")
private String licenseCode; private String licenseCode;
/** /**
* 营业执照法人名 * 营业执照法人名
*/ */
@ApiModelProperty(value = "营业执照法人名") @Schema(description = "营业执照法人名")
private String licenseUserName; private String licenseUserName;
/** /**
* 营业执照图片地址 * 营业执照图片地址
*/ */
@ApiModelProperty(value = "营业执照图片地址") @Schema(description = "营业执照图片地址")
private String licensePicUrl; private String licensePicUrl;
/** /**
* 经度 * 经度
*/ */
@ApiModelProperty(value = "经度") @Schema(description = "经度")
private String longitude; private String longitude;
/** /**
* 纬度 * 纬度
*/ */
@ApiModelProperty(value = "纬度") @Schema(description = "纬度")
private String latitude; private String latitude;
} }
} }

17
Cpop-Oam/src/main/java/com/cpop/oam/business/bo/DataImportBo.java
View File

@ -1,11 +1,10 @@
package com.cpop.oam.business.bo; package com.cpop.oam.business.bo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty; import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
/** /**
* @author DB * @author DB
@ -14,40 +13,40 @@ import javax.validation.constraints.NotBlank;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "DataImportBo对象") @Schema(description = "DataImportBo对象")
public class DataImportBo { public class DataImportBo {
/** /**
* 主键 * 主键
*/ */
@ApiModelProperty(value = "主键") @Schema(description = "主键")
private String id; private String id;
/** /**
* 品牌id * 品牌id
*/ */
@NotBlank(message = "不能为空") @NotBlank(message = "不能为空")
@ApiModelProperty(value = "品牌") @Schema(description = "品牌")
private String brandId; private String brandId;
/** /**
* 校区 * 校区
*/ */
@NotBlank(message = "不能为空") @NotBlank(message = "不能为空")
@ApiModelProperty(value = "校区") @Schema(description = "校区")
private String storeId; private String storeId;
/** /**
* 导入文件地址 * 导入文件地址
*/ */
@NotBlank(message = "不能为空") @NotBlank(message = "不能为空")
@ApiModelProperty(value = "导入文件地址") @Schema(description = "导入文件地址")
private String fileUrl; private String fileUrl;
/** /**
* 是否清空 * 是否清空
*/ */
@ApiModelProperty(value = "是否清空") @Schema(description = "是否清空")
private Boolean isClear; private Boolean isClear;
} }

12
Cpop-Oam/src/main/java/com/cpop/oam/business/bo/DataImportPageBo.java
View File

@ -1,12 +1,10 @@
package com.cpop.oam.business.bo; package com.cpop.oam.business.bo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty; import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/** /**
* @author DB * @author DB
@ -15,20 +13,20 @@ import javax.validation.constraints.NotNull;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "DataImportPageBo对象") @Schema(description = "DataImportPageBo对象")
public class DataImportPageBo { public class DataImportPageBo {
/** /**
* 导入状态 * 导入状态
*/ */
@NotNull(message = "导入状态不能为空") @NotNull(message = "导入状态不能为空")
@ApiModelProperty(value = "导入状态") @Schema(description = "导入状态")
private Boolean importStatus; private Boolean importStatus;
/** /**
* 校区名 * 校区名
*/ */
@ApiModelProperty(value = "校区名") @Schema(description = "校区名")
private String storeName; private String storeName;
} }

103
Cpop-Oam/src/main/java/com/cpop/oam/business/bo/MallStaffBo.java
View File

@ -1,103 +0,0 @@
package com.cpop.oam.business.bo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* 员工表Bo
*
* @author DB.lost
* @since 2023-05-11
*/
@Data
@Accessors(chain = true)
@ApiModel(value = "Staff对象", description = "员工表")
public class MallStaffBo implements Serializable {
/**
* 主键
*/
@ApiModelProperty("主键")
private String id;
/**
* 姓名不能为空
*/
@NotBlank(message = "姓名不能为空")
@ApiModelProperty("姓名")
private String name;
/**
* 品牌id不能为空
*/
@NotBlank(message = "品牌id不能为空")
@ApiModelProperty(value = "品牌id")
private String brandId;
/**
* 用户id
*/
@ApiModelProperty("用户id")
private String userId;
/**
* 用户名
*/
@NotBlank(message = "用户名不能为空")
@ApiModelProperty(value = "用户名",required = true)
private String userName;
/**
* 密码
*/
@NotBlank(message = "密码不能为空")
@ApiModelProperty(value = "密码",required = true)
private String password;
/**
* 昵称
*/
@NotBlank(message = "昵称不能为空")
@ApiModelProperty(value = "昵称",required = true)
private String nickName;
/**
* 邮箱
*/
@ApiModelProperty(value = "邮箱")
private String email;
/**
* 手机号
*/
@NotBlank(message = "手机号不能为空")
@ApiModelProperty(value = "手机号",required = true)
private String phoneNumber;
/**
* 性别(0:男;1:女)
*/
@NotNull(message = "性别不能为空")
@ApiModelProperty(value = "性别(0:男;1:女)",required = true)
private Boolean sex;
/**
* 头像
*/
@ApiModelProperty(value = "头像")
private String avatar;
/**
* 状态(0:停用;1:启用)
*/
@NotNull(message = "状态不能为空")
@ApiModelProperty(value = "状态(0:停用;1:启用)",required = true)
private Boolean status;
}

29
Cpop-Oam/src/main/java/com/cpop/oam/business/bo/MallStaffPageBo.java
View File

@ -1,29 +0,0 @@
package com.cpop.oam.business.bo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* 员工表Bo
*
* @author DB.lost
* @since 2023-05-11
*/
@Data
@Accessors(chain = true)
@ApiModel(value = "Staff对象", description = "员工表")
public class MallStaffPageBo implements Serializable {
/**
* 姓名不能为空
*/
@ApiModelProperty("姓名")
private String name;
}

41
Cpop-Oam/src/main/java/com/cpop/oam/business/bo/MenuBo.java
View File

@ -1,15 +1,12 @@
package com.cpop.oam.business.bo; package com.cpop.oam.business.bo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/** /**
* 系统菜单表Bo * 系统菜单表Bo
@ -19,91 +16,89 @@ import java.io.Serializable;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "SysMenu对象", description = "系统菜单表") @Schema(description = "系统菜单表")
public class MenuBo implements Serializable { public class MenuBo {
private static final long serialVersionUID = 1L;
/** /**
* 菜单ID * 菜单ID
*/ */
@ApiModelProperty("菜单ID") @Schema(description ="菜单ID")
private String id; private String id;
/** /**
* 父级菜单ID * 父级菜单ID
*/ */
@ApiModelProperty("父级菜单ID") @Schema(description ="父级菜单ID")
private String parentMenu; private String parentMenu;
/** /**
* 菜单名称 * 菜单名称
*/ */
@ApiModelProperty("菜单名称") @Schema(description ="菜单名称")
private String name; private String name;
/** /**
* 菜单图标 * 菜单图标
*/ */
@ApiModelProperty(value = "菜单图标") @Schema(description = "菜单图标")
private String icon; private String icon;
/** /**
* 菜单路由，父菜单为空 * 菜单路由，父菜单为空
*/ */
@ApiModelProperty("菜单路由，父菜单为空") @Schema(description ="菜单路由，父菜单为空")
private String component; private String component;
/** /**
* 标记菜单的状态 0:禁用 1：启用（根据权限正常显示） * 标记菜单的状态 0:禁用 1：启用（根据权限正常显示）
*/ */
@NotNull(message = "状态不能为空") @NotNull(message = "状态不能为空")
@ApiModelProperty(value = "标记菜单的状态 0:禁用 1：启用（根据权限正常显示）", required = true) @Schema(description = "标记菜单的状态 0:禁用 1：启用（根据权限正常显示）", requiredMode = Schema.RequiredMode.REQUIRED)
private Boolean status; private Boolean status;
/** /**
* 菜单类型，0:目录，1:菜单，2:按钮 * 菜单类型，0:目录，1:菜单，2:按钮
*/ */
@NotNull(message = "菜单类型不能为空") @NotNull(message = "菜单类型不能为空")
@ApiModelProperty(value = "菜单类型，0:目录，1:菜单，2:按钮", required = true) @Schema(description = "菜单类型，0:目录，1:菜单，2:按钮", requiredMode = Schema.RequiredMode.REQUIRED)
private Integer type; private Integer type;
/** /**
* 权限 * 权限
*/ */
@ApiModelProperty("权限") @Schema(description ="权限")
private String permission; private String permission;
/** /**
* 重定向路径，一级菜单有值 * 重定向路径，一级菜单有值
*/ */
@ApiModelProperty("重定向路径，一级菜单有值") @Schema(description ="重定向路径，一级菜单有值")
private String redirect; private String redirect;
/** /**
* 排序，值越小越靠前，一级菜单有值 * 排序，值越小越靠前，一级菜单有值
*/ */
@NotNull(message = "排序不能为空") @NotNull(message = "排序不能为空")
@ApiModelProperty(value = "排序，值越小越靠前，一级菜单有值", required = true) @Schema(description = "排序，值越小越靠前，一级菜单有值", requiredMode = Schema.RequiredMode.REQUIRED)
private Integer orderNo; private Integer orderNo;
/** /**
* 路由地址 * 路由地址
*/ */
@ApiModelProperty(value = "路由地址") @Schema(description = "路由地址")
private String path; private String path;
/** /**
* 标题 * 标题
*/ */
@NotBlank(message = "标题不能为空") @NotBlank(message = "标题不能为空")
@ApiModelProperty(value = "标题", required = true) @Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED)
private String title; private String title;
/** /**
* 隐藏菜单 * 隐藏菜单
*/ */
@ApiModelProperty("隐藏菜单") @Schema(description ="隐藏菜单")
private Boolean hideMenu; private Boolean hideMenu;
} }

15
Cpop-Oam/src/main/java/com/cpop/oam/business/bo/MenuListBo.java
View File

@ -1,12 +1,9 @@
package com.cpop.oam.business.bo; package com.cpop.oam.business.bo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
/** /**
* Description: * Description:
* date: 2023/4/25 18:01 * date: 2023/4/25 18:01
@ -14,20 +11,18 @@ import java.io.Serializable;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(description = "菜单传入对象") @Schema(description = "菜单传入对象")
public class MenuListBo implements Serializable { public class MenuListBo {
private static final long serialVersionUID = 1L;
/** /**
* 标题 * 标题
*/ */
@ApiModelProperty(value = "标题") @Schema(description = "标题")
private String title; private String title;
/** /**
* 标记菜单的状态 0:禁用 1：启用（根据权限正常显示） * 标记菜单的状态 0:禁用 1：启用（根据权限正常显示）
*/ */
@ApiModelProperty(value = "标记菜单的状态 0:禁用 1：启用（根据权限正常显示）") @Schema(description = "标记菜单的状态 0:禁用 1：启用（根据权限正常显示）")
private Boolean status; private Boolean status;
} }

13
Cpop-Oam/src/main/java/com/cpop/oam/business/bo/PauseWorkOrderBo.java
View File

@ -1,14 +1,13 @@
package com.cpop.oam.business.bo; package com.cpop.oam.business.bo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/** /**
* 工单暂停请求对象 * 工单暂停请求对象
@ -18,14 +17,14 @@ import javax.validation.constraints.NotNull;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "工单暂停请求对象") @Schema(description = "工单暂停请求对象")
public class PauseWorkOrderBo { public class PauseWorkOrderBo {
/** /**
* 工单id * 工单id
*/ */
@NotBlank(message = "工单id不能为空") @NotBlank(message = "工单id不能为空")
@ApiModelProperty("工单id") @Schema(description = "工单id")
private String workOrderId; private String workOrderId;
/** /**
@ -33,7 +32,7 @@ public class PauseWorkOrderBo {
*/ */
@NotNull(message = "时间不能为空") @NotNull(message = "时间不能为空")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("暂停到时间") @Schema(description = "暂停到时间")
private LocalDateTime pauseExpireTime; private LocalDateTime pauseExpireTime;
} }

28
Cpop-Oam/src/main/java/com/cpop/oam/business/bo/RoleBo.java
View File

@ -1,13 +1,11 @@
package com.cpop.oam.business.bo; package com.cpop.oam.business.bo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.List; import java.util.List;
/** /**
@ -18,55 +16,53 @@ import java.util.List;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "SysRole对象", description = "系统角色表") @Schema(description = "系统角色表")
public class RoleBo implements Serializable { public class RoleBo {
private static final long serialVersionUID = 1L;
/** /**
* 主键 * 主键
*/ */
@ApiModelProperty("主键") @Schema(description ="主键")
private String id; private String id;
/** /**
* 角色名称 * 角色名称
*/ */
@NotBlank(message = "角色名称不能为空") @NotBlank(message = "角色名称不能为空")
@ApiModelProperty("角色名称") @Schema(description ="角色名称")
private String roleName; private String roleName;
/** /**
* 角色值 * 角色值
*/ */
@NotBlank(message = "角色值不能为空") @NotBlank(message = "角色值不能为空")
@ApiModelProperty("角色值") @Schema(description ="角色值")
private String roleValue; private String roleValue;
/** /**
* 状态 * 状态
*/ */
@NotNull(message = "状态不能为空") @NotNull(message = "状态不能为空")
@ApiModelProperty("状态") @Schema(description ="状态")
private Boolean status; private Boolean status;
/** /**
* 备注 * 备注
*/ */
@ApiModelProperty("备注") @Schema(description ="备注")
private String remark; private String remark;
/** /**
* 排序 * 排序
*/ */
@NotNull(message = "排序不能为空") @NotNull(message = "排序不能为空")
@ApiModelProperty("排序") @Schema(description ="排序")
private Integer orderNo; private Integer orderNo;
/** /**
* 菜单集合 * 菜单集合
*/ */
@ApiModelProperty("菜单集合") @Schema(description ="菜单集合")
private List<String> menuIds; private List<String> menuIds;
} }

15
Cpop-Oam/src/main/java/com/cpop/oam/business/bo/RolePageBo.java
View File

@ -1,12 +1,9 @@
package com.cpop.oam.business.bo; package com.cpop.oam.business.bo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
/** /**
* Description: * Description:
* date: 2023/5/9 13:58 * date: 2023/5/9 13:58
@ -15,20 +12,18 @@ import java.io.Serializable;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "SysRole分页对象") @Schema(description = "SysRole分页对象")
public class RolePageBo implements Serializable { public class RolePageBo {
private static final long serialVersionUID = 1L;
/** /**
* 角色名称 * 角色名称
*/ */
@ApiModelProperty("角色名称") @Schema(description ="角色名称")
private String roleName; private String roleName;
/** /**
* 状态 * 状态
*/ */
@ApiModelProperty("状态") @Schema(description ="状态")
private Boolean status; private Boolean status;
} }

19
Cpop-Oam/src/main/java/com/cpop/oam/business/bo/RoleStatusBo.java
View File

@ -1,14 +1,11 @@
package com.cpop.oam.business.bo; package com.cpop.oam.business.bo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/** /**
* Description: * Description:
* date: 2023/5/9 14:12 * date: 2023/5/9 14:12
@ -17,22 +14,20 @@ import java.io.Serializable;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "SysRole状态对象", description = "修改角色状态") @Schema(description = "修改角色状态")
public class RoleStatusBo implements Serializable { public class RoleStatusBo {
private static final long serialVersionUID = 1L;
/** /**
* 主键 * 主键
*/ */
@NotBlank(message = "id不能为空") @NotBlank(message = "id不能为空")
@ApiModelProperty(value = "主键",required = true) @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED)
private String id; private String id;
/** /**
* 状态 * 状态
*/ */
@NotNull(message = "状态不能为空") @NotNull(message = "状态不能为空")
@ApiModelProperty(value = "状态", required = true) @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED)
private Boolean status; private Boolean status;
} }

106
Cpop-Oam/src/main/java/com/cpop/oam/business/bo/SummitApplyBo.java
View File

@ -1,106 +0,0 @@
package com.cpop.oam.business.bo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* @author DB
* @version 1.0.0
* @since 2024-04-10 14:41
*/
@Data
@Accessors(chain = true)
@ApiModel(value = "峰会报名请求参数")
public class SummitApplyBo {
/**
* 微信openId
*/
@NotBlank(message = "微信openId不能为空")
@ApiModelProperty(value = "微信openId",required = true)
private String openId;
/**
* 机构名称
*/
@NotBlank(message = "机构名称不能为空")
@ApiModelProperty(value = "机构名称",required = true)
private String storeName;
/**
* 牌匾号
*/
@NotBlank(message = "牌匾号不能为空")
@ApiModelProperty(value = "牌匾号",required = true)
private String boardName;
/**
* 是否是会员
*/
@ApiModelProperty(value = "是否是会员")
private String isMember = "是";
/**
* 参会人数
*/
@NotNull(message = "参会人数不能为空")
@ApiModelProperty(value = "参会人数")
private Integer joinNum;
/**
* 参会人员
*/
@NotEmpty(message = "参会人员不能为空")
@ApiModelProperty(value = "参会人员",required = true)
private List<JoinUser> users;
/**
* 房间数
*/
@ApiModelProperty(value = "房间数")
private Integer roomNum;
/**
* 需要房间
*/
@ApiModelProperty(value = "需要房间")
private String needRoom = "是";
/**
* 参加晚宴
*/
@ApiModelProperty(value = "参加晚宴")
private String joinParty = "是";
/**
* 参加交流会
*/
@ApiModelProperty(value = "参加交流会")
private String joinMeeting = "是";
@Data
@ApiModel("参会人员信息")
public static class JoinUser {
/**
* 姓名
*/
@NotBlank(message = "姓名不能为空")
@ApiModelProperty(value = "姓名",required = true)
private String name;
/**
* 手机号
*/
@NotBlank(message = "手机号不能为空")
@ApiModelProperty(value = "手机号",required = true)
private String phone;
}
}

27
Cpop-Oam/src/main/java/com/cpop/oam/business/bo/TaskWorkOrderBo.java
View File

@ -1,12 +1,11 @@
package com.cpop.oam.business.bo; package com.cpop.oam.business.bo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/** /**
* 任务-工单表Bo * 任务-工单表Bo
@ -16,61 +15,59 @@ import javax.validation.constraints.NotNull;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "TaskWorkOrder对象", description = "任务-工单表") @Schema(description = "任务-工单表")
public class TaskWorkOrderBo { public class TaskWorkOrderBo {
private static final long serialVersionUID = 1L;
/** /**
* 主键 * 主键
*/ */
@ApiModelProperty("主键") @Schema(description ="主键")
private String id; private String id;
/** /**
* 品牌id * 品牌id
*/ */
@NotBlank(message = "品牌id不能为空") @NotBlank(message = "品牌id不能为空")
@ApiModelProperty(value = "品牌id", required = true) @Schema(description = "品牌id", requiredMode = Schema.RequiredMode.REQUIRED)
private String brandId; private String brandId;
/** /**
* 校区id * 校区id
*/ */
@NotBlank(message = "校区/店铺id不能为空") @NotBlank(message = "校区/店铺id不能为空")
@ApiModelProperty(value = "校区/店铺id", required = true) @Schema(description = "校区/店铺id", requiredMode = Schema.RequiredMode.REQUIRED)
private String storeId; private String storeId;
/** /**
* 工单内容 * 工单内容
*/ */
@NotBlank(message = "工单内容不能为空") @NotBlank(message = "工单内容不能为空")
@ApiModelProperty(value = "工单内容", required = true) @Schema(description = "工单内容", requiredMode = Schema.RequiredMode.REQUIRED)
private String taskContent; private String taskContent;
/** /**
* 任务类型(0:迭代;1:需求;2:工单) * 任务类型(0:迭代;1:需求;2:工单)
*/ */
@NotNull(message = "任务类型不能为空") @NotNull(message = "任务类型不能为空")
@ApiModelProperty(value = "任务类型(0:迭代;1:需求;2:工单)", required = true) @Schema(description = "任务类型(0:迭代;1:需求;2:工单)", requiredMode = Schema.RequiredMode.REQUIRED)
private Integer taskType; private Integer taskType;
/** /**
* 问题手机号 * 问题手机号
*/ */
@ApiModelProperty("问题手机号") @Schema(description ="问题手机号")
private String phoneNumber; private String phoneNumber;
/** /**
* 附件地址 * 附件地址
*/ */
@ApiModelProperty("附件地址") @Schema(description ="附件地址")
private String attachmentUrl; private String attachmentUrl;
/** /**
* 备注 * 备注
*/ */
@ApiModelProperty("备注") @Schema(description ="备注")
private String remark; private String remark;
} }

19
Cpop-Oam/src/main/java/com/cpop/oam/business/bo/TechnologyToolBo.java
View File

@ -1,13 +1,10 @@
package com.cpop.oam.business.bo; package com.cpop.oam.business.bo;
import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModel; import jakarta.validation.constraints.NotBlank;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime;
/** /**
* @author DB * @author DB
@ -16,41 +13,41 @@ import java.time.LocalDateTime;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "TechnologyToolBo对象") @Schema(description = "TechnologyToolBo对象")
public class TechnologyToolBo { public class TechnologyToolBo {
/** /**
* 主键 * 主键
*/ */
@ApiModelProperty(value = "主键") @Schema(description = "主键")
private String id; private String id;
/** /**
* 工具名 * 工具名
*/ */
@NotBlank(message = "工具名不能为空") @NotBlank(message = "工具名不能为空")
@ApiModelProperty(value = "工具名",required = true) @Schema(description = "工具名",requiredMode = Schema.RequiredMode.REQUIRED)
private String toolName; private String toolName;
/** /**
* 工具地址 * 工具地址
*/ */
@NotBlank(message = "工具地址不能为空") @NotBlank(message = "工具地址不能为空")
@ApiModelProperty(value = "工具地址",required = true) @Schema(description = "工具地址",requiredMode = Schema.RequiredMode.REQUIRED)
private String toolUrl; private String toolUrl;
/** /**
* 工具介绍 * 工具介绍
*/ */
@NotBlank(message = "工具介绍不能为空") @NotBlank(message = "工具介绍不能为空")
@ApiModelProperty(value = "工具介绍",required = true) @Schema(description = "工具介绍",requiredMode = Schema.RequiredMode.REQUIRED)
private String toolDesc; private String toolDesc;
/** /**
* 工具类型(字典) * 工具类型(字典)
*/ */
@NotBlank(message = "工具类型不能为空") @NotBlank(message = "工具类型不能为空")
@ApiModelProperty(value = "工具类型(字典)",required = true) @Schema(description = "工具类型(字典)",requiredMode = Schema.RequiredMode.REQUIRED)
private String toolType; private String toolType;
} }

28
Cpop-Oam/src/main/java/com/cpop/oam/business/bo/WxOpenMaCodeCommitBo.java
View File

@ -1,56 +1,52 @@
package com.cpop.oam.business.bo; package com.cpop.oam.business.bo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/** /**
* @author DB * @author DB
* @createTime 2023/10/10 17:14 * @since 2023/10/10 17:14
* @description
*/ */
@Data @Data
@ApiModel(value = "OpenPlatformCommit上传代码对象") @Schema(description = "OpenPlatformCommit上传代码对象")
public class WxOpenMaCodeCommitBo implements Serializable { public class WxOpenMaCodeCommitBo {
private static final long serialVersionUID = 1L;
/** /**
* 授权方 appid * 授权方 appid
*/ */
@NotBlank(message = "授权方appid不能为空") @NotBlank(message = "授权方appid不能为空")
@ApiModelProperty(value = "授权方 appid",required = true) @Schema(description = "授权方 appid",requiredMode = Schema.RequiredMode.REQUIRED)
private String authorizerAppid; private String authorizerAppid;
/** /**
* 代码库中的代码模板 ID * 代码库中的代码模板 ID
*/ */
@NotNull(message = "代码库中的代码模板ID不能为空") @NotNull(message = "代码库中的代码模板ID不能为空")
@ApiModelProperty(value = "代码库中的代码模板 ID",required = true) @Schema(description = "代码库中的代码模板 ID",requiredMode = Schema.RequiredMode.REQUIRED)
private Long templateId; private Long templateId;
/** /**
* 为了方便第三方平台的开发者引入 extAppid 的开发调试工作 * 为了方便第三方平台的开发者引入 extAppid 的开发调试工作
*/ */
@NotBlank(message = "extJson不能为空") @NotBlank(message = "extJson不能为空")
@ApiModelProperty(value = "该参数则是用于控制ext.json配置文件的内容",required = true) @Schema(description = "该参数则是用于控制ext.json配置文件的内容",requiredMode = Schema.RequiredMode.REQUIRED)
private String extJson; private String extJson;
/** /**
* 代码版本号，开发者可自定义 * 代码版本号，开发者可自定义
*/ */
@NotBlank(message = "代码版本号不能为空") @NotBlank(message = "代码版本号不能为空")
@ApiModelProperty(value = "代码版本号，开发者可自定义",required = true) @Schema(description = "代码版本号，开发者可自定义",requiredMode = Schema.RequiredMode.REQUIRED)
private String userVersion; private String userVersion;
/** /**
* 代码描述，开发者可自定义 * 代码描述，开发者可自定义
*/ */
@NotBlank(message = "代码描述不能为空") @NotBlank(message = "代码描述不能为空")
@ApiModelProperty(value = "代码描述，开发者可自定义",required = true) @Schema(description = "代码描述，开发者可自定义",requiredMode = Schema.RequiredMode.REQUIRED)
private String userDesc; private String userDesc;
} }

9
Cpop-Oam/src/main/java/com/cpop/oam/business/bo/WxOpenMaSubmitAuditBo.java
View File

@ -1,9 +0,0 @@
package com.cpop.oam.business.bo;
/**
* @author DB
* @createTime 2023/10/10 17:35
* @description
*/
public class WxOpenMaSubmitAuditBo {
}

16
Cpop-Oam/src/main/java/com/cpop/oam/business/bo/WxOpenMaTrialQrCodeBo.java
View File

@ -1,12 +1,10 @@
package com.cpop.oam.business.bo; package com.cpop.oam.business.bo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty; import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/** /**
* @author DB * @author DB
@ -15,21 +13,19 @@ import java.io.Serializable;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "WxOpenMaTrialQrCodeBo生产二维码") @Schema(description = "WxOpenMaTrialQrCodeBo生产二维码")
public class WxOpenMaTrialQrCodeBo implements Serializable { public class WxOpenMaTrialQrCodeBo {
private static final long serialVersionUID = 1L;
/** /**
* 授权方 appid * 授权方 appid
*/ */
@NotBlank(message = "授权方appid不能为空") @NotBlank(message = "授权方appid不能为空")
@ApiModelProperty(value = "授权方 appid",required = true) @Schema(description = "授权方 appid",required = true)
private String authorizerAppid; private String authorizerAppid;
/** /**
* 指定二维码扫码后直接进入指定页面并可同时带上参数 * 指定二维码扫码后直接进入指定页面并可同时带上参数
*/ */
@ApiModelProperty("指定二维码扫码后直接进入指定页面并可同时带上参数") @Schema(description ="指定二维码扫码后直接进入指定页面并可同时带上参数")
private String path; private String path;
} }

98
Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageOamMallController.java
View File

@ -1,98 +0,0 @@
package com.cpop.oam.business.controller.backstage;
import com.cpop.core.base.entity.R;
import com.cpop.core.utils.SpringUtils;
import com.cpop.oam.business.bo.MallStaffBo;
import com.cpop.oam.business.service.OamMallService;
import com.cpop.oam.business.vo.MallStaffPageVo;
import com.cpop.system.business.service.BrandService;
import com.cpop.system.business.vo.BrandListVo;
import com.mybatisflex.core.paginate.Page;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @author DB
* @since 2023/11/09 14:40
*/
@RestController
@Tag(name = "商城管理模块")
@RequestMapping("/backstage/oamMall")
@Deprecated(since = "1.1.0")
public class BackstageOamMallController {
@Autowired
private OamMallService oamMallService;
/**
* 查询商城管理员分页列表
* @author DB
* @since 2023/11/09 15:33
* @param brandIds 品牌id集合
* @param name 姓名
* @return com.cpop.core.base.entity.R<com.mybatisflex.core.paginate.Page<com.cpop.oam.business.vo.MallStaffPageVo>>
*/
@GetMapping("/getMallStaffPage")
public R<Page<MallStaffPageVo>> getMallStaffPage(String brandIds, String name) {
Page<MallStaffPageVo> page = oamMallService.getMallStaffPage(brandIds, name);
return R.ok(page);
}
/**
* 查询品牌列表
* @author DB
* @since 2023/11/10 11:45
* @return com.cpop.core.base.entity.R<java.util.List<com.cpop.system.business.vo.BrandListVo>>
*/
@GetMapping("/getBrandList")
public R<List<BrandListVo>> getBrandList() {
List<BrandListVo> list = SpringUtils.getBean(BrandService.class).queryChain().listAs(BrandListVo.class);
return R.ok(list);
}
/**
* 用户名是否存在
* @author DB
* @since 2023/11/10 12:03
* @param username 用户名
* @param id id
* @param userType 用户类型
* @return com.cpop.core.base.entity.R<java.lang.Void>
*/
@GetMapping("/isAccountExist")
public R<Void> isAccountExist(@Parameter(description = "用户名") String username, @Parameter(description = "userId") String id, @Parameter(description = "用户类型") String userType) {
//SpringUtils.getBean(UserService.class).isAccountExist(username, id, userType);
return R.ok();
}
/**
* 新增管理员
* @author DB
* @since 2023/09/08 14:04
* @param bo 请求参数
* @return com.jambox.core.base.R<java.lang.Void>
*/
@PostMapping("/insertAdmin")
public R<Void> insertAdmin(@RequestBody @Validated MallStaffBo bo) {
oamMallService.insertAdmin(bo);
return R.ok();
}
/**
* 删除管理员
* @author DB
* @since 2023/11/10 14:33
* @param id 主键
* @return com.cpop.core.base.entity.R<java.lang.Void>
*/
@DeleteMapping("/removeAdmin/{id}")
public R<Void> removeAdmin(@PathVariable String id) {
oamMallService.removeAdmin(id);
return R.ok();
}
}

228
Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageStorePlugController.java
View File

@ -1,28 +1,8 @@
package com.cpop.oam.business.controller.backstage; package com.cpop.oam.business.controller.backstage;
import com.cpop.core.base.entity.R;
import com.cpop.core.utils.bean.BeanUtils;
import com.cpop.jambox.business.bo.PlugBo;
import com.cpop.jambox.business.entity.StorePlug;
import com.cpop.jambox.business.service.PlugService;
import com.cpop.jambox.business.service.StorePlugService;
import com.cpop.jambox.business.vo.PlugPageVo;
import com.cpop.jambox.business.vo.PlugVo;
import com.cpop.jambox.business.vo.StorePlugListVo;
import com.cpop.oam.business.bo.ChangePlugOpenBo;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import static com.cpop.jambox.business.entity.table.PlugTableDef.PLUG;
import static com.cpop.jambox.business.entity.table.StorePlugTableDef.STORE_PLUG;
/** /**
* 校区-插件记录表 控制层。 * 校区-插件记录表 控制层。
@ -36,107 +16,107 @@ import static com.cpop.jambox.business.entity.table.StorePlugTableDef.STORE_PLUG
@Deprecated(since = "1.1.0") @Deprecated(since = "1.1.0")
public class BackstageStorePlugController { public class BackstageStorePlugController {
@Autowired // @Autowired
private StorePlugService storePlugService; // private StorePlugService storePlugService;
//
@Autowired // @Autowired
private PlugService plugService; // private PlugService plugService;
//
/** // /**
* 查询插件分页 // * 查询插件分页
* @author DB // * @author DB
* @since 2024/1/5 // * @since 2024/1/5
* @return R<Page<PlugPageVo>> // * @return R<Page<PlugPageVo>>
*/ // */
@GetMapping("/getPlugPage") // @GetMapping("/getPlugPage")
@Operation(summary = "查询插件分页") // @Operation(summary = "查询插件分页")
public R<Page<PlugPageVo>> getPlugPage() { // public R<Page<PlugPageVo>> getPlugPage() {
Page<PlugPageVo> page = plugService.getPlugPage(); // Page<PlugPageVo> page = plugService.getPlugPage();
return R.ok(page); // return R.ok(page);
} // }
//
/** // /**
* 查询插件详情 // * 查询插件详情
* @author DB // * @author DB
* @since 2024/1/5 // * @since 2024/1/5
* @param id 主键 // * @param id 主键
* @return R<PlugVo> // * @return R<PlugVo>
*/ // */
@GetMapping("/getPlugById/{id}") // @GetMapping("/getPlugById/{id}")
@Operation(summary = "查询插件详情") // @Operation(summary = "查询插件详情")
public R<PlugVo> getPlugById(@PathVariable String id) { // public R<PlugVo> getPlugById(@PathVariable String id) {
PlugVo vo = plugService.getOneAs(QueryWrapper.create().where(PLUG.ID.eq(id)), PlugVo.class); // PlugVo vo = plugService.getOneAs(QueryWrapper.create().where(PLUG.ID.eq(id)), PlugVo.class);
return R.ok(vo); // return R.ok(vo);
} // }
//
/** // /**
* 新增插件 // * 新增插件
* @author DB // * @author DB
* @since 2024/1/5 // * @since 2024/1/5
* @param bo 请求参数 // * @param bo 请求参数
* @return R<Void> // * @return R<Void>
*/ // */
@Operation(summary = "新增插件") // @Operation(summary = "新增插件")
@PostMapping("/insertPlug") // @PostMapping("/insertPlug")
public R<Void> insertPlug(@RequestBody @Validated PlugBo bo) { // public R<Void> insertPlug(@RequestBody @Validated PlugBo bo) {
plugService.insertPlug(bo); // plugService.insertPlug(bo);
return R.ok(); // return R.ok();
} // }
//
/** // /**
* 修改插件 // * 修改插件
* @author DB // * @author DB
* @since 2024/1/5 // * @since 2024/1/5
* @param bo 请求参数 // * @param bo 请求参数
* @return R<Void> // * @return R<Void>
*/ // */
@Operation(summary = "修改插件") // @Operation(summary = "修改插件")
@PutMapping("/updatePlug") // @PutMapping("/updatePlug")
public R<Void> updateStaff(@RequestBody @Validated PlugBo bo) { // public R<Void> updateStaff(@RequestBody @Validated PlugBo bo) {
plugService.updatePlug(bo); // plugService.updatePlug(bo);
return R.ok(); // return R.ok();
} // }
//
/** // /**
* 删除插件 // * 删除插件
* @author DB // * @author DB
* @since 2024/1/5 // * @since 2024/1/5
* @param id 主键 // * @param id 主键
* @return R<Void> // * @return R<Void>
*/ // */
@Operation(summary = "删除插件") // @Operation(summary = "删除插件")
@DeleteMapping("/removePlugById/{id}") // @DeleteMapping("/removePlugById/{id}")
public R<Void> removeStaffById(@PathVariable String id) { // public R<Void> removeStaffById(@PathVariable String id) {
plugService.removeById(id); // plugService.removeById(id);
return R.ok(); // return R.ok();
} // }
//
/** // /**
* 查询校区插件列表 // * 查询校区插件列表
* // *
* @param brandId brandId // * @param brandId brandId
* @param storeId storeId // * @param storeId storeId
*/ // */
@GetMapping("/getStorePlugList") // @GetMapping("/getStorePlugList")
@Operation(summary = "查询校区插件列表") // @Operation(summary = "查询校区插件列表")
public R<List<StorePlugListVo>> getStorePlugList(@Parameter(description = "品牌id") String brandId, @Parameter(description = "校区id") String storeId) { // public R<List<StorePlugListVo>> getStorePlugList(@Parameter(description = "品牌id") String brandId, @Parameter(description = "校区id") String storeId) {
List<StorePlugListVo> list = storePlugService.getStorePlugList(brandId, storeId); // List<StorePlugListVo> list = storePlugService.getStorePlugList(brandId, storeId);
return R.ok(list); // return R.ok(list);
} // }
//
/** // /**
* 插件开启与关闭 // * 插件开启与关闭
*/ // */
@PutMapping("/changePlugOpen") // @PutMapping("/changePlugOpen")
@Operation(summary = "插件开启与关闭") // @Operation(summary = "插件开启与关闭")
public R<Void> changePlugOpen(@RequestBody @Validated ChangePlugOpenBo bo) { // public R<Void> changePlugOpen(@RequestBody @Validated ChangePlugOpenBo bo) {
StorePlug storePlug = BeanUtils.mapToClass(bo, StorePlug.class); // StorePlug storePlug = BeanUtils.mapToClass(bo, StorePlug.class);
if (bo.getIsOpen()){ // if (bo.getIsOpen()){
storePlugService.save(storePlug); // storePlugService.save(storePlug);
} else { // } else {
storePlugService.updateChain().where(STORE_PLUG.STORE_ID.eq(bo.getStoreId())).and(STORE_PLUG.PLUG_TAG.eq(bo.getPlugTag())).remove(); // storePlugService.updateChain().where(STORE_PLUG.STORE_ID.eq(bo.getStoreId())).and(STORE_PLUG.PLUG_TAG.eq(bo.getPlugTag())).remove();
} // }
return R.ok(); // return R.ok();
} // }
} }

58
Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageTaskWorkOrderController.java
View File

@ -1,7 +1,6 @@
package com.cpop.oam.business.controller.backstage; package com.cpop.oam.business.controller.backstage;
import com.cpop.core.base.entity.R; import com.cpop.core.base.entity.R;
import com.cpop.jambox.business.vo.BrandListVo;
import com.cpop.oam.business.bo.AgreeOrRejectEnforceFinishBo; import com.cpop.oam.business.bo.AgreeOrRejectEnforceFinishBo;
import com.cpop.oam.business.bo.PauseWorkOrderBo; import com.cpop.oam.business.bo.PauseWorkOrderBo;
import com.cpop.oam.business.bo.TaskWorkOrderBo; import com.cpop.oam.business.bo.TaskWorkOrderBo;
@ -10,13 +9,13 @@ import com.cpop.oam.business.service.TaskWorkOrderService;
import com.cpop.oam.business.vo.*; import com.cpop.oam.business.vo.*;
import com.cpop.system.business.service.BrandService; import com.cpop.system.business.service.BrandService;
import com.cpop.system.business.service.StoreService; import com.cpop.system.business.service.StoreService;
import com.cpop.system.business.vo.BrandListVo;
import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.paginate.Page;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.annotations.ApiParam; import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -32,7 +31,7 @@ import static com.cpop.system.business.entity.table.StoreTableDef.STORE;
* @since 2023-09-18 * @since 2023-09-18
*/ */
@RestController @RestController
@Api(tags = "工单模块-工单") @Tag(name = "工单模块-工单")
@RequestMapping("/backstage/taskWorkOrder") @RequestMapping("/backstage/taskWorkOrder")
public class BackstageTaskWorkOrderController { public class BackstageTaskWorkOrderController {
@ -51,8 +50,7 @@ public class BackstageTaskWorkOrderController {
* @since 2023/09/18 17:18 * @since 2023/09/18 17:18
* @return com.cpop.core.base.entity.R<com.mybatisflex.core.paginate.Page<com.cpop.oam.business.vo.TaskWorkOrderPageVo>> * @return com.cpop.core.base.entity.R<com.mybatisflex.core.paginate.Page<com.cpop.oam.business.vo.TaskWorkOrderPageVo>>
*/ */
@PreAuthorize("@aps.hasPermission('oamTask:workOrder:list')") @Operation(summary = "工单模块-工单提交-接收/处理/暂停中")
@ApiOperation("工单模块-工单提交-接收/处理/暂停中")
@GetMapping("/receiveDealPause") @GetMapping("/receiveDealPause")
public R<TaskWorkOrderReceiveDealPauseVo> receiveDealPause() { public R<TaskWorkOrderReceiveDealPauseVo> receiveDealPause() {
TaskWorkOrderReceiveDealPauseVo vo = taskWorkOrderService.receiveDealPause(); TaskWorkOrderReceiveDealPauseVo vo = taskWorkOrderService.receiveDealPause();
@ -64,7 +62,7 @@ public class BackstageTaskWorkOrderController {
* @author DB * @author DB
* @since 2023-11-29 14:01:03 * @since 2023-11-29 14:01:03
*/ */
@ApiOperation("工单模块-工单提交-获取当天值班人员") @Operation(summary = "工单模块-工单提交-获取当天值班人员")
@GetMapping("/getWorkOrderDutyStaff") @GetMapping("/getWorkOrderDutyStaff")
public R<WorkOrderDutyVo> getWorkOrderDutyStaff() { public R<WorkOrderDutyVo> getWorkOrderDutyStaff() {
WorkOrderDutyVo vo = taskWorkOrderService.getWorkOrderDutyStaff(); WorkOrderDutyVo vo = taskWorkOrderService.getWorkOrderDutyStaff();
@ -76,7 +74,7 @@ public class BackstageTaskWorkOrderController {
* @author DB * @author DB
* @since 2023-11-29 14:35:08 * @since 2023-11-29 14:35:08
*/ */
@ApiOperation("工单模块-工单提交-已办结分页列表") @Operation(summary = "工单模块-工单提交-已办结分页列表")
@GetMapping("/finishWorkOrderPage") @GetMapping("/finishWorkOrderPage")
public R<Page<TaskWorkOrderPageVo>> finishWorkOrderPage() { public R<Page<TaskWorkOrderPageVo>> finishWorkOrderPage() {
Page<TaskWorkOrderPageVo> page = taskWorkOrderService.finishWorkOrderPage(); Page<TaskWorkOrderPageVo> page = taskWorkOrderService.finishWorkOrderPage();
@ -90,7 +88,7 @@ public class BackstageTaskWorkOrderController {
* @author DB * @author DB
* @since 2023/5/30 16:53 * @since 2023/5/30 16:53
**/ **/
@ApiOperation("工单模块-工单提交-新增工单") @Operation(summary = "工单模块-工单提交-新增工单")
@PostMapping("/insertWorkOrder") @PostMapping("/insertWorkOrder")
public R<Void> insertWorkOrder(@RequestBody @Validated TaskWorkOrderBo bo) { public R<Void> insertWorkOrder(@RequestBody @Validated TaskWorkOrderBo bo) {
taskWorkOrderService.insertWorkOrder(bo); taskWorkOrderService.insertWorkOrder(bo);
@ -103,9 +101,9 @@ public class BackstageTaskWorkOrderController {
* @param workOrderId 工单id * @param workOrderId 工单id
* @since 2023-11-29 11:25:28 * @since 2023-11-29 11:25:28
*/ */
@ApiOperation("工单模块-工单提交-工单记录列表") @Operation(summary = "工单模块-工单提交-工单记录列表")
@GetMapping("/getWorkOrderRecordList/{workOrderId}") @GetMapping("/getWorkOrderRecordList/{workOrderId}")
public R<List<TaskWorkOrderRecordListVo>> getWorkOrderRecordList(@PathVariable @ApiParam("工单id") String workOrderId) { public R<List<TaskWorkOrderRecordListVo>> getWorkOrderRecordList(@PathVariable @Parameter(description ="工单id") String workOrderId) {
List<TaskWorkOrderRecordListVo> list = taskWorkOrderService.getWorkOrderRecordList(workOrderId); List<TaskWorkOrderRecordListVo> list = taskWorkOrderService.getWorkOrderRecordList(workOrderId);
return R.ok(list); return R.ok(list);
} }
@ -116,7 +114,7 @@ public class BackstageTaskWorkOrderController {
* @param bo 请求参数 * @param bo 请求参数
* @since 2023-11-29 11:33:35 * @since 2023-11-29 11:33:35
*/ */
@ApiOperation("工单模块-工单提交-新增工单记录") @Operation(summary = "工单模块-工单提交-新增工单记录")
@PostMapping("/insertWorkOrderRecord") @PostMapping("/insertWorkOrderRecord")
public R<Void> insertWorkOrderRecord(@RequestBody @Validated TaskWorkOrderRecordBo bo) { public R<Void> insertWorkOrderRecord(@RequestBody @Validated TaskWorkOrderRecordBo bo) {
taskWorkOrderService.insertWorkOrderRecord(bo); taskWorkOrderService.insertWorkOrderRecord(bo);
@ -129,9 +127,9 @@ public class BackstageTaskWorkOrderController {
* @param workOrderId 工单id * @param workOrderId 工单id
* @since 2023-11-29 11:41:46 * @since 2023-11-29 11:41:46
*/ */
@ApiOperation("工单模块-工单提交-工单提醒") @Operation(summary = "工单模块-工单提交-工单提醒")
@PutMapping("/workOrderRemind/{workOrderId}") @PutMapping("/workOrderRemind/{workOrderId}")
public R<Void> workOrderRemind(@PathVariable @ApiParam("工单id") String workOrderId) { public R<Void> workOrderRemind(@PathVariable @Parameter(description ="工单id") String workOrderId) {
taskWorkOrderService.workOrderRemind(workOrderId); taskWorkOrderService.workOrderRemind(workOrderId);
return R.ok(); return R.ok();
} }
@ -142,9 +140,9 @@ public class BackstageTaskWorkOrderController {
* @param workOrderId 工单id * @param workOrderId 工单id
* @since 2023-11-29 12:30:21 * @since 2023-11-29 12:30:21
*/ */
@ApiOperation("工单模块-工单提交-工单转需求") @Operation(summary = "工单模块-工单提交-工单转需求")
@PutMapping("/workOrderToDemand/{workOrderId}") @PutMapping("/workOrderToDemand/{workOrderId}")
public R<Void> workOrderToDemand(@PathVariable @ApiParam("工单id") String workOrderId) { public R<Void> workOrderToDemand(@PathVariable @Parameter(description ="工单id") String workOrderId) {
taskWorkOrderService.workOrderToDemand(workOrderId); taskWorkOrderService.workOrderToDemand(workOrderId);
return R.ok(); return R.ok();
} }
@ -155,7 +153,7 @@ public class BackstageTaskWorkOrderController {
* @param bo 请求参数 * @param bo 请求参数
* @since 2023-11-29 16:00:18 * @since 2023-11-29 16:00:18
*/ */
@ApiOperation("工单模块-工单提交-工单暂停") @Operation(summary = "工单模块-工单提交-工单暂停")
@PutMapping("/pauseWorkOrder") @PutMapping("/pauseWorkOrder")
public R<Void> pauseWorkOrder(@RequestBody @Validated PauseWorkOrderBo bo) { public R<Void> pauseWorkOrder(@RequestBody @Validated PauseWorkOrderBo bo) {
taskWorkOrderService.pauseWorkOrder(bo); taskWorkOrderService.pauseWorkOrder(bo);
@ -168,9 +166,9 @@ public class BackstageTaskWorkOrderController {
* @param workOrderId 工单id * @param workOrderId 工单id
* @since 2023-11-29 15:44:08 * @since 2023-11-29 15:44:08
*/ */
@ApiOperation("工单模块-工单提交-工单办结") @Operation(summary = "工单模块-工单提交-工单办结")
@PutMapping("/workOrderFinish/{workOrderId}") @PutMapping("/workOrderFinish/{workOrderId}")
public R<Void> workOrderFinish(@PathVariable("workOrderId") @ApiParam("工单id") String workOrderId) { public R<Void> workOrderFinish(@PathVariable("workOrderId") @Parameter(description ="工单id") String workOrderId) {
taskWorkOrderService.workOrderFinish(workOrderId); taskWorkOrderService.workOrderFinish(workOrderId);
return R.ok(); return R.ok();
} }
@ -181,9 +179,9 @@ public class BackstageTaskWorkOrderController {
* @param brandName 品牌名 * @param brandName 品牌名
* @since 2023-11-30 17:59:29 * @since 2023-11-30 17:59:29
*/ */
@ApiOperation("工单模块-工单提交-获取品牌列表") @Operation(summary = "工单模块-工单提交-获取品牌列表")
@GetMapping("/getBrandList") @GetMapping("/getBrandList")
public R<List<BrandListVo>> getBrandList(@ApiParam("品牌名") String brandName) { public R<List<BrandListVo>> getBrandList(@Parameter(description ="品牌名") String brandName) {
List<BrandListVo> list = brandService.queryChain().and(BRAND.BRAND_NAME.like(brandName)).listAs(BrandListVo.class); List<BrandListVo> list = brandService.queryChain().and(BRAND.BRAND_NAME.like(brandName)).listAs(BrandListVo.class);
return R.ok(list); return R.ok(list);
} }
@ -194,9 +192,9 @@ public class BackstageTaskWorkOrderController {
* @param brandId 品牌id * @param brandId 品牌id
* @since 2023-11-30 18:00:08 * @since 2023-11-30 18:00:08
*/ */
@ApiOperation("工单模块-工单提交-获取校区/店铺列表") @Operation(summary = "工单模块-工单提交-获取校区/店铺列表")
@GetMapping("/getStoreList") @GetMapping("/getStoreList")
public R<List<StoreListVo>> getStoreList(@ApiParam("品牌id") String brandId) { public R<List<StoreListVo>> getStoreList(@Parameter(description ="品牌id") String brandId) {
List<StoreListVo> list = storeService.queryChain().and(STORE.BRAND_ID.eq(brandId)).listAs(StoreListVo.class); List<StoreListVo> list = storeService.queryChain().and(STORE.BRAND_ID.eq(brandId)).listAs(StoreListVo.class);
return R.ok(list); return R.ok(list);
} }
@ -210,11 +208,11 @@ public class BackstageTaskWorkOrderController {
* @param endDate 结束日期 * @param endDate 结束日期
* @return R<Page<TaskWorkOrderPageVo>> * @return R<Page<TaskWorkOrderPageVo>>
*/ */
@ApiOperation("工单统计-获取工单统计分页") @Operation(summary = "工单统计-获取工单统计分页")
@GetMapping("/getWorkOrderStatPage") @GetMapping("/getWorkOrderStatPage")
public R<Page<TaskWorkOrderStatPageVo>> getWorkOrderStatPage(@ApiParam("员工id") @RequestParam(value = "staffId", required = false) String staffId, public R<Page<TaskWorkOrderStatPageVo>> getWorkOrderStatPage(@Parameter(description = "员工id") @RequestParam(value = "staffId", required = false) String staffId,
@RequestParam(value = "startDate", required = false) @ApiParam("开始日期") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate startDate, @RequestParam(value = "startDate", required = false) @Parameter(description ="开始日期") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate startDate,
@RequestParam(value = "endDate", required = false) @ApiParam("结束日期") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate endDate) { @RequestParam(value = "endDate", required = false) @Parameter(description ="结束日期") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate endDate) {
Page<TaskWorkOrderStatPageVo> page = taskWorkOrderService.getWorkOrderStatPage(staffId, startDate, endDate); Page<TaskWorkOrderStatPageVo> page = taskWorkOrderService.getWorkOrderStatPage(staffId, startDate, endDate);
return R.ok(page); return R.ok(page);
} }
@ -226,7 +224,7 @@ public class BackstageTaskWorkOrderController {
* @param bo 请求参数 * @param bo 请求参数
* @return R<Void> * @return R<Void>
*/ */
@ApiOperation("工单模块-工单提交-同意与拒绝强制办结") @Operation(summary = "工单模块-工单提交-同意与拒绝强制办结")
@PutMapping("/agreeOrRejectEnforceFinish") @PutMapping("/agreeOrRejectEnforceFinish")
public R<Void> agreeOrRejectEnforceFinish(@RequestBody @Validated AgreeOrRejectEnforceFinishBo bo) { public R<Void> agreeOrRejectEnforceFinish(@RequestBody @Validated AgreeOrRejectEnforceFinishBo bo) {
taskWorkOrderService.agreeOrRejectEnforceFinish(bo); taskWorkOrderService.agreeOrRejectEnforceFinish(bo);

36
Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageTechnologyToolController.java
View File

@ -1,23 +1,23 @@
package com.cpop.oam.business.controller.backstage; package com.cpop.oam.business.controller.backstage;
import com.cpop.common.utils.bean.BeanUtils; import com.cpop.core.utils.bean.BeanUtils;
import com.cpop.core.base.entity.R;
import com.cpop.core.base.entity.PageDomain; import com.cpop.core.base.entity.PageDomain;
import com.cpop.core.base.entity.R;
import com.cpop.core.utils.SqlUtils; import com.cpop.core.utils.SqlUtils;
import com.cpop.oam.business.bo.TechnologyToolBo; import com.cpop.oam.business.bo.TechnologyToolBo;
import com.cpop.oam.business.entity.TechnologyTool;
import com.cpop.oam.business.service.TechnologyToolService;
import com.cpop.oam.business.vo.TechnologyToolPageVo; import com.cpop.oam.business.vo.TechnologyToolPageVo;
import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.query.QueryWrapper;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
import com.cpop.oam.business.entity.TechnologyTool;
import com.cpop.oam.business.service.TechnologyToolService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import static com.cpop.core.base.table.table.SysUserTableDef.SYS_USER; import static com.cpop.core.base.table.table.UserTableDef.USER;
import static com.cpop.oam.business.entity.table.StaffTableDef.STAFF; import static com.cpop.oam.business.entity.table.StaffTableDef.STAFF;
import static com.cpop.oam.business.entity.table.TechnologyToolTableDef.TECHNOLOGY_TOOL; import static com.cpop.oam.business.entity.table.TechnologyToolTableDef.TECHNOLOGY_TOOL;
@ -28,7 +28,7 @@ import static com.cpop.oam.business.entity.table.TechnologyToolTableDef.TECHNOLO
* @since 2023-12-10 * @since 2023-12-10
*/ */
@RestController @RestController
@Api(tags = "技术工具管理") @Tag(name = "技术工具管理")
@RequestMapping("/backstage/technologyTool") @RequestMapping("/backstage/technologyTool")
public class BackstageTechnologyToolController { public class BackstageTechnologyToolController {
@ -42,14 +42,14 @@ public class BackstageTechnologyToolController {
* @return Page<TechnologyToolPageVo> * @return Page<TechnologyToolPageVo>
*/ */
@GetMapping("/getTechnologyToolPage") @GetMapping("/getTechnologyToolPage")
@ApiOperation("技术工具分页查询") @Operation(summary = "技术工具分页查询")
public R<Page<TechnologyToolPageVo>> getTechnologyToolPage(@RequestParam("toolType") @ApiParam(value = "工具类型", required = true) String toolType) { public R<Page<TechnologyToolPageVo>> getTechnologyToolPage(@RequestParam("toolType") @Parameter(description = "工具类型", required = true) String toolType) {
PageDomain pageDomain = SqlUtils.getInstance().getPageDomain(); PageDomain pageDomain = SqlUtils.getInstance().getPageDomain();
Page<TechnologyToolPageVo> page = technologyToolService.pageAs(Page.of(pageDomain.getPageNum(), pageDomain.getPageSize()), Page<TechnologyToolPageVo> page = technologyToolService.pageAs(Page.of(pageDomain.getPageNum(), pageDomain.getPageSize()),
QueryWrapper.create().select(TECHNOLOGY_TOOL.ALL_COLUMNS) QueryWrapper.create().select(TECHNOLOGY_TOOL.ALL_COLUMNS)
.select(STAFF.NAME.as(TechnologyToolPageVo::getCreateUser)) .select(STAFF.NAME.as(TechnologyToolPageVo::getCreateUser))
.leftJoin(SYS_USER).on(SYS_USER.ID.eq(TECHNOLOGY_TOOL.CREATE_USER_ID)) .leftJoin(USER).on(USER.ID.eq(TECHNOLOGY_TOOL.CREATE_USER_ID))
.leftJoin(STAFF).on(STAFF.USER_ID.eq(SYS_USER.ID)) .leftJoin(STAFF).on(STAFF.USER_ID.eq(USER.ID))
.where(TECHNOLOGY_TOOL.TOOL_TYPE.eq(toolType)), .where(TECHNOLOGY_TOOL.TOOL_TYPE.eq(toolType)),
TechnologyToolPageVo.class); TechnologyToolPageVo.class);
return R.ok(page); return R.ok(page);
@ -63,7 +63,7 @@ public class BackstageTechnologyToolController {
* @return R<Void> * @return R<Void>
*/ */
@PostMapping("/insertTool") @PostMapping("/insertTool")
@ApiOperation("保存技术工具") @Operation(summary = "保存技术工具")
public R<Void> insertTool(@RequestBody @Validated TechnologyToolBo bo) { public R<Void> insertTool(@RequestBody @Validated TechnologyToolBo bo) {
technologyToolService.save(BeanUtils.mapToClass(bo, TechnologyTool.class)); technologyToolService.save(BeanUtils.mapToClass(bo, TechnologyTool.class));
return R.ok(); return R.ok();
@ -77,7 +77,7 @@ public class BackstageTechnologyToolController {
* @return R<Void> * @return R<Void>
*/ */
@PutMapping("/updateTool") @PutMapping("/updateTool")
@ApiOperation("根据主键更新技术工具") @Operation(summary = "根据主键更新技术工具")
public R<Void> update(@RequestBody @Validated TechnologyToolBo bo) { public R<Void> update(@RequestBody @Validated TechnologyToolBo bo) {
technologyToolService.updateById(BeanUtils.mapToClass(bo, TechnologyTool.class)); technologyToolService.updateById(BeanUtils.mapToClass(bo, TechnologyTool.class));
return R.ok(); return R.ok();
@ -90,8 +90,8 @@ public class BackstageTechnologyToolController {
* @return {@code true} 删除成功，{@code false} 删除失败 * @return {@code true} 删除成功，{@code false} 删除失败
*/ */
@DeleteMapping("/removeById/{id}") @DeleteMapping("/removeById/{id}")
@ApiOperation("根据主键删除技术工具") @Operation(summary = "根据主键删除技术工具")
public R<Void> remove(@PathVariable @ApiParam("技术工具表主键") String id) { public R<Void> remove(@PathVariable @Parameter(description = "技术工具表主键") String id) {
technologyToolService.removeById(id); technologyToolService.removeById(id);
return R.ok(); return R.ok();
} }

31
Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageWxCpController.java
View File

@ -5,16 +5,15 @@ import com.cpop.oam.business.service.OamWxCpService;
import com.cpop.oam.business.vo.WxCpLoginVo; import com.cpop.oam.business.vo.WxCpLoginVo;
import com.cpop.oam.framework.config.wxCp.WxCpConfiguration; import com.cpop.oam.framework.config.wxCp.WxCpConfiguration;
import com.cpop.system.business.vo.LoginUserInfoVo; import com.cpop.system.business.vo.LoginUserInfoVo;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.cp.api.WxCpService; import me.chanjar.weixin.cp.api.WxCpService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
/** /**
* @author DB * @author DB
@ -23,7 +22,7 @@ import javax.servlet.http.HttpServletRequest;
*/ */
@Slf4j @Slf4j
@RestController @RestController
@Api(tags = "企业微信相关模块") @Tag(name = "企业微信相关模块")
@RequestMapping("/backstage/wxCp") @RequestMapping("/backstage/wxCp")
public class BackstageWxCpController { public class BackstageWxCpController {
@ -40,7 +39,7 @@ public class BackstageWxCpController {
* @return {@link R<LoginUserInfoVo>} * @return {@link R<LoginUserInfoVo>}
**/ **/
@GetMapping("/getOauth2Url") @GetMapping("/getOauth2Url")
@ApiOperation("获取oauth2认证链接") @Operation(summary = "获取oauth2认证链接")
public R<String> getOauth2Url() { public R<String> getOauth2Url() {
WxCpService cpService = WxCpConfiguration.getCpService(1000024); WxCpService cpService = WxCpConfiguration.getCpService(1000024);
String authUrl = cpService.getOauth2Service().buildAuthorizationUrl(oAuth2registerUrl, null, "snsapi_privateinfo"); String authUrl = cpService.getOauth2Service().buildAuthorizationUrl(oAuth2registerUrl, null, "snsapi_privateinfo");
@ -54,7 +53,7 @@ public class BackstageWxCpController {
* @return {@link R<LoginUserInfoVo>} * @return {@link R<LoginUserInfoVo>}
**/ **/
@GetMapping("/loginUserInfoByCode") @GetMapping("/loginUserInfoByCode")
@ApiOperation("根据code换取用户信息") @Operation(summary = "根据code换取用户信息")
public R<WxCpLoginVo> loginUserInfoByCode(HttpServletRequest httpServletRequest, @RequestParam("code") String code) { public R<WxCpLoginVo> loginUserInfoByCode(HttpServletRequest httpServletRequest, @RequestParam("code") String code) {
WxCpLoginVo loginVo = oamWxCpService.loginUserInfoByCode(httpServletRequest, code); WxCpLoginVo loginVo = oamWxCpService.loginUserInfoByCode(httpServletRequest, code);
return R.ok(loginVo); return R.ok(loginVo);
@ -62,13 +61,12 @@ public class BackstageWxCpController {
/** /**
* @return R<Void> * @return R<Void>
* @Description: 同步企业微信部门 * 同步企业微信部门
* @Author DB * @author DB
* @Date: 2023/5/9 20:47 * @since 2023/5/9 20:47
*/ */
@Deprecated @Deprecated
@PreAuthorize("@aps.hasPermission('*:*:*')") @Operation(summary = "同步企业微信部门")
@ApiOperation("同步企业微信部门")
@PostMapping("/syncWxCpDept") @PostMapping("/syncWxCpDept")
public R<Void> syncWxCpDept() { public R<Void> syncWxCpDept() {
oamWxCpService.syncWxCpDept(); oamWxCpService.syncWxCpDept();
@ -77,13 +75,12 @@ public class BackstageWxCpController {
/** /**
* @return R<Void> * @return R<Void>
* @Description: 同步企业微信员工 * 同步企业微信员工
* @Author DB * @author DB
* @Date: 2023/5/9 20:47 * @since 2023/5/9 20:47
*/ */
@Deprecated @Deprecated
@PreAuthorize("@aps.hasPermission('*:*:*')") @Operation(summary = "同步企业微信员工")
@ApiOperation("同步企业微信员工")
@PostMapping("/syncWxCpStaff") @PostMapping("/syncWxCpStaff")
public R<Void> syncWxCpStaff() { public R<Void> syncWxCpStaff() {
oamWxCpService.syncWxCpStaff(); oamWxCpService.syncWxCpStaff();

186
Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageWxOpenController.java
View File

@ -1,20 +1,20 @@
package com.cpop.oam.business.controller.backstage; package com.cpop.oam.business.controller.backstage;
import cn.binarywang.wx.miniapp.bean.WxMaAuditMediaUploadResult; import cn.binarywang.wx.miniapp.bean.WxMaAuditMediaUploadResult;
import com.cpop.common.utils.StringUtils;
import com.cpop.core.base.entity.R;
import com.cpop.core.base.entity.PageDomain; import com.cpop.core.base.entity.PageDomain;
import com.cpop.core.base.entity.R;
import com.cpop.core.base.exception.ServiceException; import com.cpop.core.base.exception.ServiceException;
import com.cpop.core.utils.SqlUtils; import com.cpop.core.utils.SqlUtils;
import com.cpop.core.utils.StringUtils;
import com.cpop.oam.business.bo.WxOpenMaCodeCommitBo; import com.cpop.oam.business.bo.WxOpenMaCodeCommitBo;
import com.cpop.oam.business.bo.WxOpenMaTrialQrCodeBo; import com.cpop.oam.business.bo.WxOpenMaTrialQrCodeBo;
import com.cpop.oam.business.service.WxOpenMiniService; import com.cpop.oam.business.service.WxOpenMiniService;
import com.cpop.oam.business.vo.WxOpenMiniVo; import com.cpop.oam.business.vo.WxOpenMiniVo;
import com.cpop.oam.framework.config.wxOpen.WxOpenProperties; import com.cpop.oam.framework.config.wxOpen.WechatOpenProperties;
import com.cpop.oam.framework.handler.wxOpen.WxOpenService; import com.cpop.oam.framework.handler.wxOpen.WxOpenService;
import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.paginate.Page;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.api.WxConsts;
import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.error.WxErrorException;
import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage; import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;
@ -27,7 +27,6 @@ import me.chanjar.weixin.open.bean.result.*;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -42,11 +41,11 @@ import java.util.List;
/** /**
* @author DB * @author DB
* @createTime 2023/10/10 13:40 * @since 2023/10/10 13:40
* @description 微信开放平台 * 微信开放平台
*/ */
@RestController @RestController
@Api(tags = "微信开放平台模块") @Tag(name = "微信开放平台模块")
@RequestMapping("/backstage/wxOpen") @RequestMapping("/backstage/wxOpen")
public class BackstageWxOpenController { public class BackstageWxOpenController {
@ -56,22 +55,21 @@ public class BackstageWxOpenController {
private WxOpenService wxOpenService; private WxOpenService wxOpenService;
@Autowired @Autowired
private WxOpenProperties properties; private WechatOpenProperties properties;
@Autowired @Autowired
private WxOpenMiniService wxOpenMiniService; private WxOpenMiniService wxOpenMiniService;
/** /**
* @descriptions 第三方平台授权 * 第三方平台授权
* @author DB * @author DB
* @date 2023/10/10 13:43 * @since 2023/10/10 13:43
* @param requestBody 请求参数 * @param requestBody 请求参数
* @param timestamp 时间戳 * @param timestamp 时间戳
* @param nonce 随机串 * @param nonce 随机串
* @param signature 签名 * @param signature 签名
* @param encType 解密类型 * @param encType 解密类型
* @param msgSignature 签名信息 * @param msgSignature 签名信息
* @return: java.lang.Object 返回
*/ */
@RequestMapping("/receiveTicket") @RequestMapping("/receiveTicket")
public Object receiveTicket(@RequestBody(required = false) String requestBody, @RequestParam("timestamp") String timestamp, public Object receiveTicket(@RequestBody(required = false) String requestBody, @RequestParam("timestamp") String timestamp,
@ -97,13 +95,12 @@ public class BackstageWxOpenController {
* @Author DB * @Author DB
* @Date: 2023/6/14 21:47 * @Date: 2023/6/14 21:47
*/ */
@PreAuthorize("@aps.hasPermission('wxOpen:applet:insert')") @Operation(summary = "获取授权链接")
@ApiOperation("获取授权链接")
@GetMapping("/getAuthorizedLink") @GetMapping("/getAuthorizedLink")
public R<String> getAuthorizedLink() { public R<String> getAuthorizedLink() {
String preAuthUrl; String preAuthUrl;
try { try {
preAuthUrl = wxOpenService.getWxOpenComponentService().getPreAuthUrl(properties.getRedirectUri()); preAuthUrl = wxOpenService.getWxOpenComponentService().getPreAuthUrl(properties.getAuthorizedLink());
} catch (WxErrorException e) { } catch (WxErrorException e) {
throw new ServiceException(e.getMessage()); throw new ServiceException(e.getMessage());
} }
@ -111,11 +108,11 @@ public class BackstageWxOpenController {
} }
/** /**
* @descriptions 授权回调地址 * 授权回调地址
* @author DB * @author DB
* @date 2023/10/10 15:49 * @since 2023/10/10 15:49
* @param authorizationCode 授权码 * @param authorizationCode 授权码
* @return: me.chanjar.weixin.open.bean.result.WxOpenQueryAuthResult * @return me.chanjar.weixin.open.bean.result.WxOpenQueryAuthResult
*/ */
@GetMapping("/redirectUrl") @GetMapping("/redirectUrl")
@ResponseBody @ResponseBody
@ -129,9 +126,8 @@ public class BackstageWxOpenController {
} }
/** /**
* @descriptions
* @author DB * @author DB
* @date 2023/10/10 14:56 * @since 2023/10/10 14:56
* @param requestBody 请求体 * @param requestBody 请求体
* @param appId appid * @param appId appid
* @param signature 签名 * @param signature 签名
@ -140,7 +136,6 @@ public class BackstageWxOpenController {
* @param openid openId * @param openid openId
* @param encType 加密类型 * @param encType 加密类型
* @param msgSignature 加密信息 * @param msgSignature 加密信息
* @return: java.lang.Object
*/ */
@RequestMapping("/{appId}/callback") @RequestMapping("/{appId}/callback")
public Object callback(@RequestBody(required = false) String requestBody, public Object callback(@RequestBody(required = false) String requestBody,
@ -193,15 +188,15 @@ public class BackstageWxOpenController {
/** /**
* @param appid 绑定小程序appid * @param appid 绑定小程序appid
* @return R<String> * @return R<String>
* @Description: 小程序绑定开放平台 * 小程序绑定开放平台
* @Author DB * @author DB
* @Date: 2023/6/14 21:47 * @since 2023/6/14 21:47
*/ */
@ApiOperation("小程序绑定开放平台") @Operation(summary = "小程序绑定开放平台")
@GetMapping("/bindOpenAccount/{appid}") @GetMapping("/bindOpenAccount/{appid}")
public R<Void> bindOpenAccount(@PathVariable String appid) { public R<Void> bindOpenAccount(@PathVariable String appid) {
try { try {
wxOpenService.getWxOpenComponentService().bindOpenAccount(appid, WxConsts.AppIdType.MINI_TYPE, properties.getOpenAppid()); wxOpenService.getWxOpenComponentService().bindOpenAccount(appid, WxConsts.AppIdType.MINI_TYPE, properties.getComponentAppId());
} catch (WxErrorException e) { } catch (WxErrorException e) {
throw new ServiceException(e.getMessage()); throw new ServiceException(e.getMessage());
} }
@ -209,17 +204,17 @@ public class BackstageWxOpenController {
} }
/** /**
* @Description: 解除绑定开放平台帐号 * 解除绑定开放平台帐号
* @param appid 绑定小程序appid * @param appid 绑定小程序appid
* @return R<String> * @return R<String>
* @Author DB * @author DB
* @Date: 2023/6/14 21:47 * @since 2023/6/14 21:47
*/ */
@ApiOperation("解除绑定开放平台帐号") @Operation(summary = "解除绑定开放平台帐号")
@GetMapping("/unbindOpenAccount/{appid}") @GetMapping("/unbindOpenAccount/{appid}")
public R<Void> unbindOpenAccount(@PathVariable String appid) { public R<Void> unbindOpenAccount(@PathVariable String appid) {
try { try {
wxOpenService.getWxOpenComponentService().unbindOpenAccount(appid, WxConsts.AppIdType.MINI_TYPE, properties.getOpenAppid()); wxOpenService.getWxOpenComponentService().unbindOpenAccount(appid, WxConsts.AppIdType.MINI_TYPE, properties.getComponentAppId());
} catch (WxErrorException e) { } catch (WxErrorException e) {
throw new ServiceException(e.getMessage()); throw new ServiceException(e.getMessage());
} }
@ -228,12 +223,11 @@ public class BackstageWxOpenController {
/** /**
* @return R<Page<Map<String, String>>> * @return R<Page<Map<String, String>>>
* @Description: 获取授权小程序列表 * 获取授权小程序列表
* @author DB * @author DB
* @Date: 2023/6/14 0014 17:00 * @since 2023/6/14 0014 17:00
*/ */
@PreAuthorize("@aps.hasPermission('wxOpen:applet:list')") @Operation(summary = "获取授权小程序列表")
@ApiOperation("获取授权小程序列表")
@GetMapping("/getAuthorizerList") @GetMapping("/getAuthorizerList")
public R<Page<WxOpenMiniVo>> getAuthorizerList() { public R<Page<WxOpenMiniVo>> getAuthorizerList() {
try { try {
@ -249,13 +243,12 @@ public class BackstageWxOpenController {
} }
/** /**
* @Description: 数据同步 * 数据同步
* @return R<Void> * @return R<Void>
* @author DB * @author DB
* @Date: 2023/6/16 0016 17:34 * @since 2023/6/16 0016 17:34
*/ */
@PreAuthorize("@aps.hasPermission('wxOpen:applet:update')") @Operation(summary = "数据同步")
@ApiOperation("数据同步")
@PutMapping("/dataSync/{authorizerAppid}") @PutMapping("/dataSync/{authorizerAppid}")
public R<Void> dataSync(@PathVariable("authorizerAppid") String authorizerAppid) { public R<Void> dataSync(@PathVariable("authorizerAppid") String authorizerAppid) {
try { try {
@ -268,14 +261,13 @@ public class BackstageWxOpenController {
} }
/** /**
* @Description: 获取授权小程序详情 * 获取授权小程序详情
* @param authorizerAppid 授权小程序appid * @param authorizerAppid 授权小程序appid
* @return R<List<OpenPlatformAuthorizerListVo>> * @return R<List<OpenPlatformAuthorizerListVo>>
* @author DB * @author DB
* @Date: 2023/6/15 0015 16:38 * @since 2023/6/15 0015 16:38
*/ */
@PreAuthorize("@aps.hasPermission('wxOpen:applet:info')") @Operation(summary = "获取授权小程序详情")
@ApiOperation("获取授权小程序详情")
@GetMapping("/getAuthorizerInfo/{authorizerAppid}") @GetMapping("/getAuthorizerInfo/{authorizerAppid}")
public R<WxOpenAuthorizerInfoResult> getAuthorizerInfo(@PathVariable String authorizerAppid) { public R<WxOpenAuthorizerInfoResult> getAuthorizerInfo(@PathVariable String authorizerAppid) {
try { try {
@ -287,14 +279,13 @@ public class BackstageWxOpenController {
} }
/** /**
* @Description: 上传代码并生成体验版 * 上传代码并生成体验版
* @param bo 请求参数 * @param bo 请求参数
* @return R<Void> * @return R<Void>
* @author DB * @author DB
* @Date: 2023/6/16 0016 17:34 * @since 2023/6/16 0016 17:34
*/ */
@PreAuthorize("@aps.hasPermission('wxOpen:applet:update')") @Operation(summary = "上传代码并生成体验版")
@ApiOperation("上传代码并生成体验版")
@PostMapping("/commit") @PostMapping("/commit")
public R<Void> commit(@RequestBody @Validated WxOpenMaCodeCommitBo bo) { public R<Void> commit(@RequestBody @Validated WxOpenMaCodeCommitBo bo) {
try { try {
@ -307,14 +298,13 @@ public class BackstageWxOpenController {
} }
/** /**
* @Description: 获取体验版二维码 * 获取体验版二维码
* @param bo 请求参数 * @param bo 请求参数
* @return R<JSONObject> * @return R<JSONObject>
* @author DB * @author DB
* @Date: 2023/6/16 0016 17:35 * @since 2023/6/16 0016 17:35
*/ */
@PreAuthorize("@aps.hasPermission('wxOpen:applet:info')") @Operation(summary = "获取体验版二维码")
@ApiOperation("获取体验版二维码")
@PostMapping("/getTrialQrCode") @PostMapping("/getTrialQrCode")
public R<String> getTrialQrCode(@RequestBody WxOpenMaTrialQrCodeBo bo) { public R<String> getTrialQrCode(@RequestBody WxOpenMaTrialQrCodeBo bo) {
try { try {
@ -333,14 +323,13 @@ public class BackstageWxOpenController {
} }
/** /**
* @Description: 提交代码审核 * 提交代码审核
* @param message 微信小程序代码包提交审核(仅供第三方开发者代小程序调用 * @param message 微信小程序代码包提交审核(仅供第三方开发者代小程序调用
* @return R<Void> * @return R<Void>
* @author DB * @author DB
* @Date: 2023/6/16 0016 17:34 * @since 2023/6/16 0016 17:34
*/ */
@PreAuthorize("@aps.hasPermission('wxOpen:applet:update')") @Operation(summary = "提交代码审核")
@ApiOperation("提交代码审核")
@PostMapping("/submitAudit/{authorizerAppid}") @PostMapping("/submitAudit/{authorizerAppid}")
public R<WxOpenMaSubmitAuditResult> submitAudit(@PathVariable String authorizerAppid ,@RequestBody WxOpenMaSubmitAuditMessage message) { public R<WxOpenMaSubmitAuditResult> submitAudit(@PathVariable String authorizerAppid ,@RequestBody WxOpenMaSubmitAuditMessage message) {
try { try {
@ -353,15 +342,13 @@ public class BackstageWxOpenController {
} }
/** /**
* @descriptions 查询审核单状态 * 查询审核单状态
* @author DB * @author DB
* @date 2023/10/10 17:41 * @since 2023/10/10 17:41
* @param authorizerAppid 授权appid * @param authorizerAppid 授权appid
* @param auditId 审核id * @param auditId 审核id
* @return: com.cpop.core.base.entity.R<me.chanjar.weixin.open.bean.result.WxOpenMaQueryAuditResult>
*/ */
@PreAuthorize("@aps.hasPermission('wxOpen:applet:info')") @Operation(summary = "查询审核单状态")
@ApiOperation("查询审核单状态")
@GetMapping("/getAuditStatus") @GetMapping("/getAuditStatus")
public R<WxOpenMaQueryAuditResult> getAuditStatus(@RequestParam("authorizerAppid") String authorizerAppid, @RequestParam("auditId") Long auditId) { public R<WxOpenMaQueryAuditResult> getAuditStatus(@RequestParam("authorizerAppid") String authorizerAppid, @RequestParam("auditId") Long auditId) {
try { try {
@ -373,13 +360,12 @@ public class BackstageWxOpenController {
} }
/** /**
* @Description: 撤回代码审核 * 撤回代码审核
* @return R<Void> * @return R<Void>
* @author DB * @author DB
* @Date: 2023/6/16 0016 17:34 * @since 2023/6/16 0016 17:34
*/ */
@PreAuthorize("@aps.hasPermission('wxOpen:applet:update')") @Operation(summary = "撤回代码审核")
@ApiOperation("撤回代码审核")
@PutMapping("/undoAudit/{authorizerAppid}") @PutMapping("/undoAudit/{authorizerAppid}")
public R<Void> getAuditStatus(@PathVariable String authorizerAppid) { public R<Void> getAuditStatus(@PathVariable String authorizerAppid) {
try { try {
@ -391,13 +377,12 @@ public class BackstageWxOpenController {
} }
/** /**
* @Description: 发布已通过审核的小程序 * 发布已通过审核的小程序
* @return R<Void> * @return R<Void>
* @author DB * @author DB
* @Date: 2023/6/16 0016 17:34 * @since 2023/6/16 0016 17:34
*/ */
@PreAuthorize("@aps.hasPermission('wxOpen:applet:update')") @Operation(summary = "发布已通过审核的小程序")
@ApiOperation("发布已通过审核的小程序")
@PutMapping("/release/{authorizerAppid}") @PutMapping("/release/{authorizerAppid}")
public R<Void> release(@PathVariable String authorizerAppid) { public R<Void> release(@PathVariable String authorizerAppid) {
try { try {
@ -409,13 +394,12 @@ public class BackstageWxOpenController {
} }
/** /**
* @Description: 撤回代码审核 * 撤回代码审核
* @return R<Void> * @return R<Void>
* @author DB * @author DB
* @Date: 2023/6/16 0016 17:34 * @since 2023/6/16 0016 17:34
*/ */
@PreAuthorize("@aps.hasPermission('wxOpen:applet:update')") @Operation(summary = "小程序版本回退")
@ApiOperation("小程序版本回退")
@PutMapping("/revertCodeRelease/{authorizerAppid}") @PutMapping("/revertCodeRelease/{authorizerAppid}")
public R<Void> revertCodeRelease(@PathVariable String authorizerAppid) { public R<Void> revertCodeRelease(@PathVariable String authorizerAppid) {
try { try {
@ -427,13 +411,12 @@ public class BackstageWxOpenController {
} }
/** /**
* @Description: 加急代码审核 * 加急代码审核
* @return R<Void> * @return R<Void>
* @author DB * @author DB
* @Date: 2023/6/16 0016 17:34 * @since 2023/6/16 0016 17:34
*/ */
@PreAuthorize("@aps.hasPermission('wxOpen:applet:update')") @Operation(summary = "加急代码审核")
@ApiOperation("加急代码审核")
@PutMapping("/speedupCodeAudit") @PutMapping("/speedupCodeAudit")
public R<Void> speedupCodeAudit(@RequestParam("authorizerAppid") String authorizerAppid, @RequestParam("auditId") Long auditId) { public R<Void> speedupCodeAudit(@RequestParam("authorizerAppid") String authorizerAppid, @RequestParam("auditId") Long auditId) {
try { try {
@ -445,13 +428,12 @@ public class BackstageWxOpenController {
} }
/** /**
* 查询小程序版本信息
* @return R<OpenPlatformVersionInfoVo> * @return R<OpenPlatformVersionInfoVo>
* @Description: 查询小程序版本信息
* @author DB * @author DB
* @Date: 2023/6/16 0016 17:34 * @since 2023/6/16 0016 17:34
*/ */
@PreAuthorize("@aps.hasPermission('wxOpen:applet:info')") @Operation(summary = "查询小程序版本信息")
@ApiOperation("查询小程序版本信息")
@GetMapping("/getVersionInfo/{authorizerAppid}") @GetMapping("/getVersionInfo/{authorizerAppid}")
public R<WxOpenVersioninfoResult> getVersionInfo(@PathVariable String authorizerAppid) { public R<WxOpenVersioninfoResult> getVersionInfo(@PathVariable String authorizerAppid) {
try { try {
@ -463,13 +445,12 @@ public class BackstageWxOpenController {
} }
/** /**
* @Description: 查询最新一次审核单状态 * 查询最新一次审核单状态
* @return R<Void> * @return R<Void>
* @author DB * @author DB
* @Date: 2023/6/16 0016 17:34 * @Date: 2023/6/16 0016 17:34
*/ */
@PreAuthorize("@aps.hasPermission('wxOpen:applet:info')") @Operation(summary = "查询最新一次审核单状态")
@ApiOperation("查询最新一次审核单状态")
@GetMapping("/getLatestAuditStatus/{authorizerAppid}") @GetMapping("/getLatestAuditStatus/{authorizerAppid}")
public R<WxOpenMaQueryAuditResult> getLatestAuditStatus(@PathVariable String authorizerAppid) { public R<WxOpenMaQueryAuditResult> getLatestAuditStatus(@PathVariable String authorizerAppid) {
try { try {
@ -481,13 +462,12 @@ public class BackstageWxOpenController {
} }
/** /**
* 上传提审素材
* @return R<OpenPlatformVersionInfoVo> * @return R<OpenPlatformVersionInfoVo>
* @Description: 上传提审素材
* @author DB * @author DB
* @Date: 2023/6/16 0016 17:34 * @since 2023/6/16 0016 17:34
*/ */
@PreAuthorize("@aps.hasPermission('wxOpen:applet:update')") @Operation(summary = "上传提审素材")
@ApiOperation("上传提审素材")
@PostMapping("/uploadMediaToCodeAudit/{authorizerAppid}") @PostMapping("/uploadMediaToCodeAudit/{authorizerAppid}")
public R<WxMaAuditMediaUploadResult> uploadMediaToCodeAudit(@RequestParam("file") File file, @PathVariable("authorizerAppid") String authorizerAppid) { public R<WxMaAuditMediaUploadResult> uploadMediaToCodeAudit(@RequestParam("file") File file, @PathVariable("authorizerAppid") String authorizerAppid) {
try { try {
@ -499,14 +479,12 @@ public class BackstageWxOpenController {
} }
/** /**
* @descriptions 获取模板列表 * 获取模板列表
* @author DB * @author DB
* @date 2023/10/10 18:17 * @since 2023/10/10 18:17
* @param templateType 模板类型 * @param templateType 模板类型
* @return: com.cpop.core.base.entity.R<java.util.List<me.chanjar.weixin.open.bean.WxOpenMaCodeTemplate>>
*/ */
@PreAuthorize("@aps.hasPermission('wxOpen:applet:info')") @Operation(summary = "获取模板列表")
@ApiOperation("获取模板列表")
@GetMapping("/getTemplateList") @GetMapping("/getTemplateList")
public R<List<WxOpenMaCodeTemplate>> getTemplateList(Integer templateType) { public R<List<WxOpenMaCodeTemplate>> getTemplateList(Integer templateType) {
try { try {
@ -518,13 +496,12 @@ public class BackstageWxOpenController {
} }
/** /**
* @Description: 获取草稿箱列表 * 获取草稿箱列表
* @return R<Void> * @return R<Void>
* @author DB * @author DB
* @Date: 2023/6/16 0016 17:34 * @since 2023/6/16 0016 17:34
*/ */
@PreAuthorize("@aps.hasPermission('wxOpen:applet:info')") @Operation(summary = "获取草稿箱列表")
@ApiOperation("获取草稿箱列表")
@GetMapping("/getTemplateDraftList") @GetMapping("/getTemplateDraftList")
public R<List<WxOpenMaCodeTemplate>> getTemplateDraftList() { public R<List<WxOpenMaCodeTemplate>> getTemplateDraftList() {
try { try {
@ -536,15 +513,13 @@ public class BackstageWxOpenController {
} }
/** /**
* @descriptions 将草稿添加到模板库 * 将草稿添加到模板库
* @author DB * @author DB
* @date 2023/10/10 18:16 * @since 2023/10/10 18:16
* @param draftId 草稿id * @param draftId 草稿id
* @param templateType 模板类型 * @param templateType 模板类型
* @return: com.cpop.core.base.entity.R<java.lang.Void>
*/ */
@PreAuthorize("@aps.hasPermission('wxOpen:applet:update')") @Operation(summary = "将草稿添加到模板库")
@ApiOperation("将草稿添加到模板库")
@PostMapping("/addToTemplate") @PostMapping("/addToTemplate")
public R<Void> addToTemplate(@RequestParam("draftId") Long draftId, @RequestParam("templateType") Integer templateType) { public R<Void> addToTemplate(@RequestParam("draftId") Long draftId, @RequestParam("templateType") Integer templateType) {
try { try {
@ -556,14 +531,13 @@ public class BackstageWxOpenController {
} }
/** /**
* @Description: 删除代码模板 * 删除代码模板
* @param templateId 模板id * @param templateId 模板id
* @return R<Void> * @return R<Void>
* @author DB * @author DB
* @Date: 2023/6/27 0027 14:28 * @since 2023/6/27 0027 14:28
*/ */
@PreAuthorize("@aps.hasPermission('wxOpen:applet:remove')") @Operation(summary = "删除代码模板")
@ApiOperation("删除代码模板")
@DeleteMapping("/deleteTemplate/{templateId}") @DeleteMapping("/deleteTemplate/{templateId}")
public R<Void> deleteTemplate(@PathVariable Integer templateId) { public R<Void> deleteTemplate(@PathVariable Integer templateId) {
try { try {

93
Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageWxPayController.java
View File

@ -1,93 +0,0 @@
package com.cpop.oam.business.controller.backstage;
import com.alibaba.fastjson.JSONObject;
import com.cpop.common.utils.StringUtils;
import com.cpop.core.base.entity.R;
import com.cpop.core.base.exception.ServiceException;
import com.cpop.pay.framewok.config.wxPay.WxPayConfiguration;
import com.cpop.system.business.entity.Brand;
import com.cpop.system.business.service.BrandService;
import com.github.binarywang.wxpay.bean.profitsharing.request.ProfitSharingReceiverRequest;
import com.github.binarywang.wxpay.config.WxPayConfig;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.github.binarywang.wxpay.service.WxPayService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.Map;
import static com.cpop.system.business.entity.table.BrandTableDef.BRAND;
/**
* @author DB
* @createTime 2023/11/15 11:21
* @description
*/
@RestController
@Api(tags = "微信支付模块")
@RequestMapping("/backstage/wxPay")
public class BackstageWxPayController {
@Autowired
private WxPayConfiguration wxPayConfiguration;
@Autowired
private WxPayService wxPayService;
@Autowired
private BrandService brandService;
/**
* @descriptions 开通微信分账
* @author DB
* @date 2023/11/15 11:06
* @return: com.cpop.core.base.entity.R<java.lang.Void>
*/
@ApiOperation("开通微信分账")
@PutMapping("/changeBrandSharing")
public R<Void> changeBrandSharing(@RequestBody @Validated ChangeWechatSharingBo bo) {
//获取品牌下属商户
Brand brand = brandService.getById(bo.getBrandId());
if (StringUtils.isBlank(brand.getWxMchId())) {
throw new ServiceException("当前品牌暂未绑定系统,请联系相关人员绑定");
}
//固定商户信息
Map<String, Object> mapReceiver = new HashMap<>(4);
mapReceiver.put("type", "MERCHANT_ID");
mapReceiver.put("account", wxPayConfiguration.getProperties().getSharingAccount());
//添加分账接收方
ProfitSharingReceiverRequest profitSharingReceiver = new ProfitSharingReceiverRequest();
//开启
if (bo.getIsOpenSharing()) {
mapReceiver.put("relation_type", "SERVICE_PROVIDER");
mapReceiver.put("name", wxPayConfiguration.getProperties().getSharingAccountName());
profitSharingReceiver.setReceiver(JSONObject.toJSONString(mapReceiver));
WxPayConfig config = wxPayService.getConfig();
config.setSubMchId(brand.getWxMchId());
try {
wxPayService.getProfitSharingService().addReceiver(profitSharingReceiver);
} catch (WxPayException e) {
throw new ServiceException(e.getMessage());
}
} else {
//关闭
profitSharingReceiver.setReceiver(JSONObject.toJSONString(mapReceiver));
WxPayConfig config = wxPayService.getConfig();
config.setSubMchId(brand.getWxMchId());
try {
wxPayService.getProfitSharingService().removeReceiver(profitSharingReceiver);
} catch (WxPayException e) {
throw new ServiceException(e.getMessage());
}
}
brandService.updateChain().set(BRAND.IS_OPEN_SHARING, bo.getIsOpenSharing()).where(BRAND.ID.eq(bo.getBrandId())).update();
return R.ok();
}
}

42
Cpop-Oam/src/main/java/com/cpop/oam/business/controller/callback/CallBackCloudCallbackController.java
View File

@ -1,42 +0,0 @@
package com.cpop.oam.business.controller.callback;
import com.cpop.core.base.entity.R;
import com.cpop.oam.business.bo.CloudUnionCallbackBo;
import com.cpop.oam.framework.enums.CloudCallbackEnums;
import com.cpop.oam.framework.strategy.cloud.CloudCallbackStrategy;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author DB
* @version 1.0.0
* @since 2024-01-16 11:28
*/
@Api(tags = "云回调controller")
@RestController
@RequestMapping("/cloudCallback")
@Deprecated
public class CallBackCloudCallbackController {
/**
* 云联合回调
* @author DB
* @since 2024/1/16
* @param callback 回调参数
* @return R<Void>
*/
//@SimpleSignatureCheck
@ApiOperation("云联合回调")
@PostMapping("/cloudUnionCallback")
public R<Void> cloudUnionCallback(@RequestBody @Validated CloudUnionCallbackBo callback) {
CloudCallbackStrategy cloudCallbackStrategy = CloudCallbackEnums.valueOf(callback.getCallbackEnum()).getCloudCallbackStrategy();
cloudCallbackStrategy.callback(callback);
return R.ok();
}
}

8
Cpop-Oam/src/main/java/com/cpop/oam/business/controller/callback/CallbackCloudController.java
View File

@ -4,8 +4,8 @@ import com.cpop.core.base.entity.R;
import com.cpop.oam.business.bo.CloudUnionCallbackBo; import com.cpop.oam.business.bo.CloudUnionCallbackBo;
import com.cpop.oam.framework.enums.CloudCallbackEnums; import com.cpop.oam.framework.enums.CloudCallbackEnums;
import com.cpop.oam.framework.strategy.cloud.CloudCallbackStrategy; import com.cpop.oam.framework.strategy.cloud.CloudCallbackStrategy;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
* @version 1.0.0 * @version 1.0.0
* @since 2024-01-16 11:28 * @since 2024-01-16 11:28
*/ */
@Api(tags = "云回调controller") @Tag(name = "云回调controller")
@RestController @RestController
@RequestMapping("/callback/cloud") @RequestMapping("/callback/cloud")
public class CallbackCloudController { public class CallbackCloudController {
@ -30,7 +30,7 @@ public class CallbackCloudController {
* @return R<Void> * @return R<Void>
*/ */
//@SimpleSignatureCheck //@SimpleSignatureCheck
@ApiOperation("云联合回调") @Operation(summary = "云联合回调")
@PostMapping("/cloudUnionCallback") @PostMapping("/cloudUnionCallback")
public R<Void> cloudUnionCallback(@RequestBody @Validated CloudUnionCallbackBo callback) { public R<Void> cloudUnionCallback(@RequestBody @Validated CloudUnionCallbackBo callback) {
CloudCallbackStrategy cloudCallbackStrategy = CloudCallbackEnums.valueOf(callback.getCallbackEnum()).getCloudCallbackStrategy(); CloudCallbackStrategy cloudCallbackStrategy = CloudCallbackEnums.valueOf(callback.getCallbackEnum()).getCloudCallbackStrategy();

13
Cpop-Oam/src/main/java/com/cpop/oam/business/controller/callback/CallbackWxCpController.java
View File

@ -1,10 +1,10 @@
package com.cpop.oam.business.controller.callback; package com.cpop.oam.business.controller.callback;
import com.cpop.common.utils.JsonUtils; import com.cpop.core.utils.JsonUtils;
import com.cpop.common.utils.StringUtils; import com.cpop.core.utils.StringUtils;
import com.cpop.oam.business.service.OamWxCpService; import com.cpop.oam.business.service.OamWxCpService;
import com.cpop.oam.framework.config.wxCp.WxCpConfiguration; import com.cpop.oam.framework.config.wxCp.WxCpConfiguration;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.tags.Tag;
import me.chanjar.weixin.cp.api.WxCpService; import me.chanjar.weixin.cp.api.WxCpService;
import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage; import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage;
import me.chanjar.weixin.cp.bean.message.WxCpXmlOutMessage; import me.chanjar.weixin.cp.bean.message.WxCpXmlOutMessage;
@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
* @createTime 2023/10/12 15:17 * @createTime 2023/10/12 15:17
* @description 企业微信认证回调接口 * @description 企业微信认证回调接口
*/ */
@Api(tags = "企业微信消息接收controller") @Tag(name = "企业微信消息接收controller")
@RestController @RestController
@RequestMapping("/callback/wxCp/{agentId}") @RequestMapping("/callback/wxCp/{agentId}")
public class CallbackWxCpController { public class CallbackWxCpController {
@ -97,10 +97,7 @@ public class CallbackWxCpController {
* @param state 信息 注册 * @param state 信息 注册
*/ */
@GetMapping(produces = "text/plain;charset=utf-8", value = "/registerCode") @GetMapping(produces = "text/plain;charset=utf-8", value = "/registerCode")
public void registerCode(@PathVariable public void registerCode(@PathVariable Integer agentId, @RequestParam("code") String code, @RequestParam("state") String state) {
Integer agentId, @RequestParam("code")
String code, @RequestParam("state")
String state) {
oamWxCpService.registerCode(agentId, code); oamWxCpService.registerCode(agentId, code);
} }

109
Cpop-Oam/src/main/java/com/cpop/oam/business/controller/callback/WxCpPortalController.java
View File

@ -1,109 +0,0 @@
package com.cpop.oam.business.controller.callback;
import com.cpop.common.utils.JsonUtils;
import com.cpop.common.utils.StringUtils;
import com.cpop.oam.business.service.OamWxCpService;
import com.cpop.oam.framework.config.wxCp.WxCpConfiguration;
import io.swagger.annotations.Api;
import me.chanjar.weixin.cp.api.WxCpService;
import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage;
import me.chanjar.weixin.cp.bean.message.WxCpXmlOutMessage;
import me.chanjar.weixin.cp.util.crypto.WxCpCryptUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* @author DB
* @createTime 2023/10/12 15:17
* @description 企业微信认证回调接口
*/
@Api(tags = "企业微信消息接收controller")
@RestController
@RequestMapping("/wxCp/portal/{agentId}")
@Deprecated
public class WxCpPortalController {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired
private OamWxCpService oamWxCpService;
@GetMapping(produces = "text/plain;charset=utf-8")
public String authGet(@PathVariable
Integer agentId, @RequestParam(name = "msg_signature", required = false)
String signature, @RequestParam(name = "timestamp", required = false)
String timestamp, @RequestParam(name = "nonce", required = false)
String nonce, @RequestParam(name = "echostr", required = false)
String echostr) {
this.logger.info("\n接收到来自微信服务器的认证消息：signature = [{}], timestamp = [{}], nonce = [{}], echostr = [{}]",
signature,
timestamp,
nonce,
echostr);
if (StringUtils.isAnyBlank(signature, timestamp, nonce, echostr)) {
throw new IllegalArgumentException("请求参数非法，请核实!");
}
final WxCpService wxCpService = WxCpConfiguration.getCpService(agentId);
if (wxCpService == null) {
throw new IllegalArgumentException(String.format("未找到对应agentId=[%d]的配置，请核实！", agentId));
}
if (wxCpService.checkSignature(signature, timestamp, nonce, echostr)) {
return new WxCpCryptUtil(wxCpService.getWxCpConfigStorage()).decrypt(echostr);
}
return "非法请求";
}
@PostMapping(produces = "application/xml; charset=UTF-8")
public String post(@PathVariable
Integer agentId, @RequestBody
String requestBody, @RequestParam("msg_signature")
String signature, @RequestParam("timestamp")
String timestamp, @RequestParam("nonce")
String nonce) {
this.logger.info("\n接收微信请求：[signature=[{}], timestamp=[{}], nonce=[{}], requestBody=[\n{}\n] ",
signature,
timestamp,
nonce,
requestBody);
final WxCpService wxCpService = WxCpConfiguration.getCpService(agentId);
WxCpXmlMessage inMessage = WxCpXmlMessage
.fromEncryptedXml(requestBody, wxCpService.getWxCpConfigStorage(), timestamp, nonce, signature);
this.logger.debug("\n消息解密后内容为：\n{} ", JsonUtils.toJson(inMessage));
WxCpXmlOutMessage outMessage = this.route(agentId, inMessage);
if (outMessage == null) {
return "";
}
String out = outMessage.toEncryptedXml(wxCpService.getWxCpConfigStorage());
this.logger.debug("\n组装回复信息：{}", out);
return out;
}
private WxCpXmlOutMessage route(Integer agentId, WxCpXmlMessage message) {
try {
return WxCpConfiguration.getRouters().get(agentId).route(message);
} catch (Exception e) {
this.logger.error(e.getMessage(), e);
}
return null;
}
/**
* 企微的o2认证可查询用户敏感信息
* @author DB
* @since 2023/11/17 14:42
* @param agentId 企业微信服务应用id
* @param code 授权码
* @param state 信息 注册
*/
@GetMapping(produces = "text/plain;charset=utf-8", value = "/registerCode")
public void registerCode(@PathVariable
Integer agentId, @RequestParam("code")
String code, @RequestParam("state")
String state) {
oamWxCpService.registerCode(agentId, code);
}
}

156
Cpop-Oam/src/main/java/com/cpop/oam/business/controller/mini/MiniSummitController.java
View File

@ -1,156 +0,0 @@
package com.cpop.oam.business.controller.mini;
import cn.binarywang.wx.miniapp.api.WxMaQrcodeService;
import cn.binarywang.wx.miniapp.api.WxMaService;
import com.alibaba.excel.EasyExcel;
import com.cpop.api.tencent.wxWork.handler.WebHookSendHandler;
import com.cpop.common.utils.bean.BeanUtils;
import com.cpop.core.base.entity.R;
import com.cpop.core.base.exception.ServiceException;
import com.cpop.core.utils.SpringUtils;
import com.cpop.core.utils.file.FileUtils;
import com.cpop.oam.business.bo.SummitApplyBo;
import com.cpop.oam.business.dto.SummitApplyDto;
import com.cpop.oam.business.entity.SummitApply;
import com.cpop.oam.business.entity.SummitApplyUser;
import com.cpop.oam.business.service.SummitApplyService;
import com.cpop.oam.business.service.SummitApplyUserService;
import com.cpop.oam.framework.constant.WebHookKeyConstant;
import com.mybatisflex.core.query.QueryWrapper;
import com.qcloud.cos.model.UploadResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.error.WxErrorException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.*;
import java.util.stream.Collectors;
import static com.cpop.oam.business.entity.table.SummitApplyTableDef.SUMMIT_APPLY;
/**
* @author DB
* @version 1.0.0
* @since 2024-04-10 14:33
*/
@RestController
@Api(tags = "小程序峰会接口")
@RequestMapping("/mini/summit")
@Slf4j
public class MiniSummitController {
@Autowired
private SummitApplyService summitApplyService;
@Autowired
private SummitApplyUserService summitApplyUserService;
/**
* 获取峰会二维码
* @author DB
* @since 2023/12/07
*/
@ApiOperation("获取峰会二维码")
@GetMapping("/getSummitQrCode")
@Deprecated
public R<String> getSummitQrCode() throws WxErrorException, IOException {
WxMaQrcodeService qrcodeService = SpringUtils.getBean(WxMaService.class).getQrcodeService();
//"release"
File qrCode = qrcodeService.createWxaCodeUnlimit("100", "pages/pay/pay", false, "trial", 430,
true, null, false);
MultipartFile multipartFile = FileUtils.getInstance().getMultipartFile(qrCode);
TencentCosHandler tencentCosHandler = SpringUtils.getBean(TencentCosHandler.class);
UploadResult uploadResult = tencentCosHandler.cdnUpload(multipartFile);
return R.ok("https://" + uploadResult.getBucketName() + tencentCosHandler.getCdnUrl() + uploadResult.getKey());
}
/**
* 是否已报名
* @author DB
* @since 2024/4/10
* @param openId openId
* @return R<Boolean>
*/
@ApiOperation("是否已报名")
@GetMapping("/haveSummitApply")
public R<Boolean> haveSummitApply(@RequestParam @ApiParam("openId") String openId) {
long count = summitApplyService.count(QueryWrapper.create().where(SUMMIT_APPLY.OPEN_ID.eq(openId)));
return R.ok(count > 0);
}
/**
* 峰会报名
* @author DB
* @since 2024/4/10
* @param bo 请求参数
* @return R<String>
*/
@ApiOperation("峰会报名")
@PostMapping("/summitApply")
@Transactional(rollbackFor = Exception.class)
public R<String> summitApply(@RequestBody @Validated SummitApplyBo bo) {
long count = summitApplyService.count(QueryWrapper.create().where(SUMMIT_APPLY.OPEN_ID.eq(bo.getOpenId())));
if (count > 0) {
throw new ServiceException("您已报名，请勿重复提交!");
}
SummitApply summitApply = BeanUtils.mapToClass(bo, SummitApply.class);
summitApplyService.save(summitApply);
List<SummitApplyUser> summitApplyUsers = BeanUtils.mapToList(bo.getUsers(), SummitApplyUser.class);
summitApplyUsers.forEach(item->{
item.setSummitApplyId(summitApply.getId());
});
summitApplyUserService.saveBatch(summitApplyUsers);
// 企微通知值班人员
List<String> phoneList = new ArrayList<String>();
try {
SpringUtils.getBean(WebHookSendHandler.class)
.webHookSendText(WebHookKeyConstant.MARKET_BOT,
phoneList,
"==========2024峰会报名==========\n" +
"机构" + bo.getStoreName() + "报名成功",
true);
} catch (IOException e) {
throw new ServiceException("发送消息通知失败!");
}
return R.ok();
}
/**
* 导出峰会申请
* @author DB
* @since 2024/4/10
* @param response 响应流
*/
@ApiOperation(value = "导出峰会申请", notes = "export", produces = "application/octet-stream")
@GetMapping("/exportSummitApply")
public void exportSummitApply(HttpServletResponse response) throws IOException {
// 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setCharacterEncoding("utf-8");
// 这里URLEncoder.encode可以防止中文乱码 当然和easyExcel没有关系
String fileName = URLEncoder.encode("峰会报名数据", "UTF-8").replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename*=" + fileName + ".xlsx");
//获取峰会数据
Map<String, SummitApply> summitApplyMap = summitApplyService.list().stream().collect(Collectors.toMap(SummitApply::getId, item -> item));
List<SummitApplyDto> summitApplyDtos = summitApplyUserService.listAs(QueryWrapper.create(), SummitApplyDto.class);
Map<String, List<SummitApplyDto>> summitApplyDtoMap = summitApplyDtos.stream().collect(Collectors.groupingBy(SummitApplyDto::getSummitApplyId));
summitApplyDtoMap.forEach((key, value) -> {
SummitApply summitApply = summitApplyMap.get(key);
value.forEach(item -> {
BeanUtils.copyBeanProp(item, summitApply);
});
});
EasyExcel.write(response.getOutputStream(), SummitApplyDto.class).sheet("报名信息").doWrite(summitApplyDtos);
}
}

2
Cpop-Oam/src/main/java/com/cpop/oam/business/dto/TaskWorkOrderReceiveDealPauseDto.java
View File

@ -1,7 +1,5 @@
package com.cpop.oam.business.dto; package com.cpop.oam.business.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;

6
Cpop-Oam/src/main/java/com/cpop/oam/business/entity/BrandManager.java
View File

@ -6,13 +6,11 @@ import com.cpop.core.base.entity.BaseUpdateListener;
import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table; import com.mybatisflex.annotation.Table;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
/** /**
* 品牌管理员表 实体类。 * 品牌管理员表 实体类。
* *

6
Cpop-Oam/src/main/java/com/cpop/oam/business/entity/BrandManagerStore.java
View File

@ -5,13 +5,11 @@ import com.cpop.core.base.entity.BaseInsertListener;
import com.cpop.core.base.entity.BaseUpdateListener; import com.cpop.core.base.entity.BaseUpdateListener;
import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table; import com.mybatisflex.annotation.Table;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
/** /**
* 品牌管理员-品牌-校区表 实体类。 * 品牌管理员-品牌-校区表 实体类。
* *

8
Cpop-Oam/src/main/java/com/cpop/oam/business/entity/Business.java
View File

@ -6,14 +6,12 @@ import com.cpop.core.base.entity.BaseUpdateListener;
import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table; import com.mybatisflex.annotation.Table;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDate;
/** /**
* Oam-事务表 实体类。 * Oam-事务表 实体类。
* *

7
Cpop-Oam/src/main/java/com/cpop/oam/business/entity/BusinessDetail.java
View File

@ -6,13 +6,12 @@ import com.cpop.core.base.entity.BaseUpdateListener;
import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table; import com.mybatisflex.annotation.Table;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* 业务详情表 实体类。 * 业务详情表 实体类。
* *

6
Cpop-Oam/src/main/java/com/cpop/oam/business/entity/BusinessStaff.java
View File

@ -5,13 +5,11 @@ import com.cpop.core.base.entity.BaseInsertListener;
import com.cpop.core.base.entity.BaseUpdateListener; import com.cpop.core.base.entity.BaseUpdateListener;
import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table; import com.mybatisflex.annotation.Table;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
/** /**
* 事务-负责员工表 实体类。 * 事务-负责员工表 实体类。
* *

8
Cpop-Oam/src/main/java/com/cpop/oam/business/entity/Clue.java
View File

@ -3,17 +3,15 @@ package com.cpop.oam.business.entity;
import com.cpop.core.base.entity.BaseEntity; import com.cpop.core.base.entity.BaseEntity;
import com.cpop.core.base.entity.BaseInsertListener; import com.cpop.core.base.entity.BaseInsertListener;
import com.cpop.core.base.entity.BaseUpdateListener; import com.cpop.core.base.entity.BaseUpdateListener;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table; import com.mybatisflex.annotation.Table;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* 线索表 实体类。 * 线索表 实体类。
* *

9
Cpop-Oam/src/main/java/com/cpop/oam/business/entity/CluePutOff.java
View File

@ -6,15 +6,12 @@ import com.cpop.core.base.entity.BaseUpdateListener;
import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table; import com.mybatisflex.annotation.Table;
import java.io.Serializable;
import java.sql.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDate;
/** /**
* 校区延期表 实体类。 * 校区延期表 实体类。
* *

3
Cpop-Oam/src/main/java/com/cpop/oam/business/entity/ClueRecord.java
View File

@ -6,9 +6,6 @@ import com.cpop.core.base.entity.BaseUpdateListener;
import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table; import com.mybatisflex.annotation.Table;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;

6
Cpop-Oam/src/main/java/com/cpop/oam/business/entity/ClueUpdate.java
View File

@ -5,13 +5,11 @@ import com.cpop.core.base.entity.BaseInsertListener;
import com.cpop.core.base.entity.BaseUpdateListener; import com.cpop.core.base.entity.BaseUpdateListener;
import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table; import com.mybatisflex.annotation.Table;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
/** /**
* 线索更新 实体类。 * 线索更新 实体类。
* *

3
Cpop-Oam/src/main/java/com/cpop/oam/business/entity/DataImport.java
View File

@ -7,9 +7,6 @@ import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table; import com.mybatisflex.annotation.Table;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;

6
Cpop-Oam/src/main/java/com/cpop/oam/business/entity/SignArea.java
View File

@ -5,13 +5,11 @@ import com.cpop.core.base.entity.BaseInsertListener;
import com.cpop.core.base.entity.BaseUpdateListener; import com.cpop.core.base.entity.BaseUpdateListener;
import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table; import com.mybatisflex.annotation.Table;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
/** /**
* 签约目标区域表 实体类。 * 签约目标区域表 实体类。
* *

3
Cpop-Oam/src/main/java/com/cpop/oam/business/entity/SignGoal.java
View File

@ -7,9 +7,6 @@ import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table; import com.mybatisflex.annotation.Table;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;

6
Cpop-Oam/src/main/java/com/cpop/oam/business/entity/SummitApply.java
View File

@ -6,13 +6,11 @@ import com.cpop.core.base.entity.BaseUpdateListener;
import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table; import com.mybatisflex.annotation.Table;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
/** /**
* 峰会报名表 实体类。 * 峰会报名表 实体类。
* *

6
Cpop-Oam/src/main/java/com/cpop/oam/business/entity/SummitApplyUser.java
View File

@ -6,13 +6,11 @@ import com.cpop.core.base.entity.BaseUpdateListener;
import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table; import com.mybatisflex.annotation.Table;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
/** /**
* 峰会参加人员 实体类。 * 峰会参加人员 实体类。
* *

6
Cpop-Oam/src/main/java/com/cpop/oam/business/entity/TechnologyTool.java
View File

@ -6,13 +6,11 @@ import com.cpop.core.base.entity.BaseUpdateListener;
import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table; import com.mybatisflex.annotation.Table;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
/** /**
* oam-技术工具表 实体类。 * oam-技术工具表 实体类。
* *

6
Cpop-Oam/src/main/java/com/cpop/oam/business/entity/WxOpenMini.java
View File

@ -6,13 +6,11 @@ import com.cpop.core.base.entity.BaseUpdateListener;
import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table; import com.mybatisflex.annotation.Table;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
/** /**
* Oam-微信开放平台-小程序 实体类。 * Oam-微信开放平台-小程序 实体类。
* *

39
Cpop-Oam/src/main/java/com/cpop/oam/business/service/OamMallService.java
View File

@ -1,39 +0,0 @@
package com.cpop.oam.business.service;
import com.cpop.oam.business.bo.MallStaffBo;
import com.cpop.oam.business.vo.MallStaffPageVo;
import com.mybatisflex.core.paginate.Page;
import java.util.List;
/**
* 商城管理
*/
public interface OamMallService {
/**
* @descriptions 查询商城管理员分页列表
* @author DB
* @date 2023/11/09 14:47
* @return: com.mybatisflex.core.paginate.Page<com.cpop.oam.business.vo.MallStaffPageVo>
*/
Page<MallStaffPageVo> getMallStaffPage(String brandIds, String name);
/**
* @descriptions 新增管理员
* @author DB
* @date 2023/11/10 12:14
* @param bo 请求参数
* @return: void
*/
void insertAdmin(MallStaffBo bo);
/**
* @descriptions 删除管理员
* @author DB
* @date 2023/11/10 14:34
* @param id 主键
* @return: void
*/
void removeAdmin(String id);
}

2
Cpop-Oam/src/main/java/com/cpop/oam/business/service/OamWxCpService.java
View File

@ -1,8 +1,8 @@
package com.cpop.oam.business.service; package com.cpop.oam.business.service;
import com.cpop.oam.business.vo.WxCpLoginVo; import com.cpop.oam.business.vo.WxCpLoginVo;
import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequest;
/** /**
* Oam暴露的企业微信接口 * Oam暴露的企业微信接口

2
Cpop-Oam/src/main/java/com/cpop/oam/business/service/TaskService.java
View File

@ -5,8 +5,6 @@ import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.service.IService; import com.mybatisflex.core.service.IService;
import com.cpop.oam.business.bo.*; import com.cpop.oam.business.bo.*;
import com.cpop.oam.business.entity.Task; import com.cpop.oam.business.entity.Task;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.RequestParam;
import java.time.LocalDate; import java.time.LocalDate;

118
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/BrandManagerServiceImpl.java
View File

@ -1,24 +1,11 @@
package com.cpop.oam.business.service.impl; package com.cpop.oam.business.service.impl;
import com.alibaba.fastjson2.JSONObject;
import com.cpop.core.base.entity.PageDomain; import com.cpop.core.base.entity.PageDomain;
import com.cpop.core.base.exception.ServiceException;
import com.cpop.core.utils.SpringUtils;
import com.cpop.core.utils.SqlUtils; import com.cpop.core.utils.SqlUtils;
import com.cpop.core.utils.bean.BeanUtils;
import com.cpop.jambox.business.entity.BrandExtend;
import com.cpop.jambox.business.entity.StoreExtend;
import com.cpop.jambox.business.entity.table.BrandExtendTableDef;
import com.cpop.jambox.business.entity.table.StoreExtendTableDef;
import com.cpop.jambox.business.service.BrandExtendService;
import com.cpop.jambox.business.service.StoreExtendService;
import com.cpop.jambox.framework.constant.JamboxCloudUrl;
import com.cpop.oam.business.bo.BrandManagerBo; import com.cpop.oam.business.bo.BrandManagerBo;
import com.cpop.oam.business.bo.BrandManagerPageBo; import com.cpop.oam.business.bo.BrandManagerPageBo;
import com.cpop.oam.business.entity.BrandManagerStore;
import com.cpop.oam.business.entity.BrandManager; import com.cpop.oam.business.entity.BrandManager;
import com.cpop.oam.business.mapper.BrandManagerMapper; import com.cpop.oam.business.mapper.BrandManagerMapper;
import com.cpop.oam.business.service.BrandManagerStoreService;
import com.cpop.oam.business.service.BrandManagerService; import com.cpop.oam.business.service.BrandManagerService;
import com.cpop.oam.business.vo.BrandManagePageVo; import com.cpop.oam.business.vo.BrandManagePageVo;
import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.paginate.Page;
@ -27,11 +14,6 @@ import com.mybatisflex.spring.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.RestTemplate;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import static com.cpop.oam.business.entity.table.BrandManagerStoreTableDef.BRAND_MANAGER_STORE; import static com.cpop.oam.business.entity.table.BrandManagerStoreTableDef.BRAND_MANAGER_STORE;
import static com.cpop.oam.business.entity.table.BrandManagerTableDef.BRAND_MANAGER; import static com.cpop.oam.business.entity.table.BrandManagerTableDef.BRAND_MANAGER;
@ -91,14 +73,14 @@ public class BrandManagerServiceImpl extends ServiceImpl<BrandManagerMapper, Bra
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void removeBrandManagerById(String id) { public void removeBrandManagerById(String id) {
BrandManager brandManage = this.getById(id); // BrandManager brandManage = this.getById(id);
JSONObject jsonBody = new JSONObject(); // JSONObject jsonBody = new JSONObject();
jsonBody.put("_type","brandManagerDel"); // jsonBody.put("_type","brandManagerDel");
jsonBody.put("brandManagerId", brandManage.getBrandManagerCloudId()); // jsonBody.put("brandManagerId", brandManage.getBrandManagerCloudId());
SpringUtils.getBean(RestTemplate.class).postForObject(JamboxCloudUrl.COMMON_CARD_URL, jsonBody, JSONObject.class); // SpringUtils.getBean(RestTemplate.class).postForObject(JamboxCloudUrl.COMMON_CARD_URL, jsonBody, JSONObject.class);
this.removeById(id); // this.removeById(id);
//删除中间表 // //删除中间表
SpringUtils.getBean(BrandManagerStoreService.class).updateChain().where(BRAND_MANAGER_STORE.BRAND_MANAGER_ID.eq(id)).remove(); // SpringUtils.getBean(BrandManagerStoreService.class).updateChain().where(BRAND_MANAGER_STORE.BRAND_MANAGER_ID.eq(id)).remove();
} }
/** /**
@ -110,47 +92,47 @@ public class BrandManagerServiceImpl extends ServiceImpl<BrandManagerMapper, Bra
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void insertBrandManager(BrandManagerBo bo) { public void insertBrandManager(BrandManagerBo bo) {
//查询此管理员是否已存在 // //查询此管理员是否已存在
if (this.count(QueryWrapper.create().leftJoin(BRAND_MANAGER_STORE).on(BRAND_MANAGER_STORE.BRAND_MANAGER_ID.eq(BRAND_MANAGER.ID)) // if (this.count(QueryWrapper.create().leftJoin(BRAND_MANAGER_STORE).on(BRAND_MANAGER_STORE.BRAND_MANAGER_ID.eq(BRAND_MANAGER.ID))
.where(BRAND_MANAGER.NAME.eq(bo.getName())) // .where(BRAND_MANAGER.NAME.eq(bo.getName()))
.and(BRAND_MANAGER.PHONE.eq(bo.getPhone())) // .and(BRAND_MANAGER.PHONE.eq(bo.getPhone()))
.and(BRAND_MANAGER_STORE.BRAND_ID.eq(bo.getBrandId()))) > 0) { // .and(BRAND_MANAGER_STORE.BRAND_ID.eq(bo.getBrandId()))) > 0) {
throw new ServiceException("当前管理员已存在"); // throw new ServiceException("当前管理员已存在");
} // }
//获取云品牌id // //获取云品牌id
BrandExtend brandExtend = SpringUtils.getBean(BrandExtendService.class).queryChain().where(BrandExtendTableDef.BRAND_EXTEND.BRAND_ID.eq(bo.getBrandId())).one(); // BrandExtend brandExtend = SpringUtils.getBean(BrandExtendService.class).queryChain().where(BrandExtendTableDef.BRAND_EXTEND.BRAND_ID.eq(bo.getBrandId())).one();
//获取用户信息 // //获取用户信息
JSONObject jsonBody = new JSONObject(); // JSONObject jsonBody = new JSONObject();
jsonBody.put("_type", "brandManagerAdd"); // jsonBody.put("_type", "brandManagerAdd");
jsonBody.put("brandId", brandExtend.getBrandCloudId()); // jsonBody.put("brandId", brandExtend.getBrandCloudId());
jsonBody.put("name", bo.getName()); // jsonBody.put("name", bo.getName());
jsonBody.put("phone", bo.getPhone()); // jsonBody.put("phone", bo.getPhone());
jsonBody.put("position", "OAM添加"); // jsonBody.put("position", "OAM添加");
if (bo.getStoreIds() != null) { // if (bo.getStoreIds() != null) {
//获取云校区id // //获取云校区id
List<String> cloudStoreIds = SpringUtils.getBean(StoreExtendService.class).queryChain().where(StoreExtendTableDef.STORE_EXTEND.STORE_ID.in(bo.getStoreIds())).list() // List<String> cloudStoreIds = SpringUtils.getBean(StoreExtendService.class).queryChain().where(StoreExtendTableDef.STORE_EXTEND.STORE_ID.in(bo.getStoreIds())).list()
.stream().map(StoreExtend::getStoreCloudId).collect(Collectors.toList()); // .stream().map(StoreExtend::getStoreCloudId).collect(Collectors.toList());
jsonBody.put("store", cloudStoreIds); // jsonBody.put("store", cloudStoreIds);
} // }
//本地新增 // //本地新增
BrandManager brandManage = BeanUtils.mapToClass(bo, BrandManager.class); // BrandManager brandManage = BeanUtils.mapToClass(bo, BrandManager.class);
JSONObject result = SpringUtils.getBean(RestTemplate.class).postForObject(JamboxCloudUrl.COMMON_CARD_URL, jsonBody, JSONObject.class); // JSONObject result = SpringUtils.getBean(RestTemplate.class).postForObject(JamboxCloudUrl.COMMON_CARD_URL, jsonBody, JSONObject.class);
assert result != null; // assert result != null;
brandManage.setBrandManagerCloudId(result.getString("data")); // brandManage.setBrandManagerCloudId(result.getString("data"));
this.save(brandManage); // this.save(brandManage);
List<BrandManagerStore> brandManagerStores = new ArrayList<>(); // List<BrandManagerStore> brandManagerStores = new ArrayList<>();
//添加中间表 // //添加中间表
if (bo.getStoreIds() != null) { // if (bo.getStoreIds() != null) {
bo.getStoreIds().forEach(item -> { // bo.getStoreIds().forEach(item -> {
BrandManagerStore brandManageStore = new BrandManagerStore(); // BrandManagerStore brandManageStore = new BrandManagerStore();
brandManageStore.setStoreId(item).setBrandId(bo.getBrandId()).setBrandManagerId(brandManage.getId()); // brandManageStore.setStoreId(item).setBrandId(bo.getBrandId()).setBrandManagerId(brandManage.getId());
brandManagerStores.add(brandManageStore); // brandManagerStores.add(brandManageStore);
}); // });
} else { // } else {
BrandManagerStore brandManageStore = new BrandManagerStore(); // BrandManagerStore brandManageStore = new BrandManagerStore();
brandManageStore.setBrandId(bo.getBrandId()).setBrandManagerId(brandManage.getId()); // brandManageStore.setBrandId(bo.getBrandId()).setBrandManagerId(brandManage.getId());
brandManagerStores.add(brandManageStore); // brandManagerStores.add(brandManageStore);
} // }
SpringUtils.getBean(BrandManagerStoreService.class).saveBatch(brandManagerStores); // SpringUtils.getBean(BrandManagerStoreService.class).saveBatch(brandManagerStores);
} }
} }

3
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/CluePutOffServiceImpl.java
View File

@ -52,9 +52,7 @@ public class CluePutOffServiceImpl extends ServiceImpl<CluePutOffMapper, CluePut
.select(STORE.STORE_NAME,STORE.STORE_ADDR,STORE.PERSON_CHARGE_NAME,STORE.PERSON_CHARGE_PHONE) .select(STORE.STORE_NAME,STORE.STORE_ADDR,STORE.PERSON_CHARGE_NAME,STORE.PERSON_CHARGE_PHONE)
.select(BRAND.BRAND_NAME) .select(BRAND.BRAND_NAME)
.select(STORE_SIGN.EXPIRE_DATE) .select(STORE_SIGN.EXPIRE_DATE)
// 跟进间隔
.select(dateDiff(now(), CLUE.LAST_FOLLOW_UP_TIME).as(CluePageVo::getFollowUpInterval)) .select(dateDiff(now(), CLUE.LAST_FOLLOW_UP_TIME).as(CluePageVo::getFollowUpInterval))
// 签约时间
.select(dateDiff(now(), CLUE.RECEIPT_TIME).as(CluePageVo::getSignInterval)) .select(dateDiff(now(), CLUE.RECEIPT_TIME).as(CluePageVo::getSignInterval))
.from(CLUE_PUT_OFF) .from(CLUE_PUT_OFF)
.leftJoin(CLUE).on(CLUE.ID.eq(CLUE_PUT_OFF.CLUE_ID)) .leftJoin(CLUE).on(CLUE.ID.eq(CLUE_PUT_OFF.CLUE_ID))
@ -63,7 +61,6 @@ public class CluePutOffServiceImpl extends ServiceImpl<CluePutOffMapper, CluePut
.leftJoin(STORE_SIGN).on(STORE_SIGN.STORE_ID.eq(STORE.ID)) .leftJoin(STORE_SIGN).on(STORE_SIGN.STORE_ID.eq(STORE.ID))
.where(CLUE_PUT_OFF.AUDIT_STATUS.eq(0)), .where(CLUE_PUT_OFF.AUDIT_STATUS.eq(0)),
PutOffAuditPageVo.class, PutOffAuditPageVo.class,
// 负责人
item -> item.field(PutOffAuditPageVo::getPutOffStaffName) item -> item.field(PutOffAuditPageVo::getPutOffStaffName)
.queryWrapper(putOffStaff -> queryChain().select(STAFF.NAME.as(PutOffAuditPageVo::getPutOffStaffName)) .queryWrapper(putOffStaff -> queryChain().select(STAFF.NAME.as(PutOffAuditPageVo::getPutOffStaffName))
.from(STAFF) .from(STAFF)

63
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DataImportServiceImpl.java
View File

@ -7,36 +7,31 @@ import com.alibaba.excel.exception.ExcelDataConvertException;
import com.alibaba.excel.metadata.data.ReadCellData; import com.alibaba.excel.metadata.data.ReadCellData;
import com.alibaba.excel.read.listener.ReadListener; import com.alibaba.excel.read.listener.ReadListener;
import com.alibaba.excel.util.ListUtils; import com.alibaba.excel.util.ListUtils;
import com.alibaba.fastjson.JSON;
import com.cpop.common.utils.StringUtils;
import com.cpop.common.utils.bean.BeanUtils;
import com.cpop.core.base.entity.PageDomain; import com.cpop.core.base.entity.PageDomain;
import com.cpop.core.base.exception.ServiceException; import com.cpop.core.base.exception.ServiceException;
import com.cpop.core.service.RedisService; import com.cpop.core.service.RedisService;
import com.cpop.core.utils.SpringUtils; import com.cpop.core.utils.SpringUtils;
import com.cpop.core.utils.SqlUtils;
import com.cpop.core.utils.StringUtils;
import com.cpop.core.utils.bean.BeanUtils;
import com.cpop.core.utils.file.FileUploadUtils; import com.cpop.core.utils.file.FileUploadUtils;
import com.cpop.core.utils.file.FileUtils; import com.cpop.core.utils.file.FileUtils;
import com.cpop.core.utils.SqlUtils;
import com.cpop.jambox.business.entity.StoreExtend;
import com.cpop.jambox.business.service.StoreExtendService;
import com.cpop.jambox.framework.constant.JamboxCloudUrl;
import com.cpop.oam.business.bo.DataImportBo; import com.cpop.oam.business.bo.DataImportBo;
import com.cpop.oam.business.bo.DataImportPageBo; import com.cpop.oam.business.bo.DataImportPageBo;
import com.cpop.oam.business.dto.DataImportDto; import com.cpop.oam.business.dto.DataImportDto;
import com.cpop.oam.business.dto.DataImportParamsDto;
import com.cpop.oam.business.vo.DataImportPageVo;
import com.cpop.oam.framework.constant.OamRedisConstant;
import com.cpop.system.business.vo.SysFileVo;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.cpop.oam.business.entity.DataImport; import com.cpop.oam.business.entity.DataImport;
import com.cpop.oam.business.mapper.DataImportMapper; import com.cpop.oam.business.mapper.DataImportMapper;
import com.cpop.oam.business.service.DataImportService; import com.cpop.oam.business.service.DataImportService;
import com.cpop.oam.business.vo.DataImportPageVo;
import com.cpop.oam.framework.constant.OamRedisConstant;
import com.cpop.system.business.vo.SysFileVo;
import com.cpop.system.framework.handler.TencentCosHandler;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.qcloud.cos.model.UploadResult; import com.qcloud.cos.model.UploadResult;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.io.File; import java.io.File;
@ -48,7 +43,6 @@ import java.util.Map;
import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.Lock;
import static com.alibaba.excel.cache.Ehcache.BATCH_COUNT; import static com.alibaba.excel.cache.Ehcache.BATCH_COUNT;
import static com.cpop.jambox.business.entity.table.StoreExtendTableDef.STORE_EXTEND;
import static com.cpop.oam.business.entity.table.DataImportTableDef.DATA_IMPORT; import static com.cpop.oam.business.entity.table.DataImportTableDef.DATA_IMPORT;
import static com.cpop.system.business.entity.table.BrandTableDef.BRAND; import static com.cpop.system.business.entity.table.BrandTableDef.BRAND;
import static com.cpop.system.business.entity.table.StoreTableDef.STORE; import static com.cpop.system.business.entity.table.StoreTableDef.STORE;
@ -84,6 +78,7 @@ public class DataImportServiceImpl extends ServiceImpl<DataImportMapper, DataImp
.orderBy(DATA_IMPORT.CREATE_TIME.desc()), .orderBy(DATA_IMPORT.CREATE_TIME.desc()),
DataImportPageVo.class); DataImportPageVo.class);
} }
/** /**
* 新增数据导入 * 新增数据导入
* @author DB * @author DB
@ -93,7 +88,7 @@ public class DataImportServiceImpl extends ServiceImpl<DataImportMapper, DataImp
@Override @Override
public void insertDataImport(DataImportBo bo) { public void insertDataImport(DataImportBo bo) {
DataImport dataImport = BeanUtils.mapToClass(bo, DataImport.class); DataImport dataImport = BeanUtils.mapToClass(bo, DataImport.class);
dataImport.setImportStatus(false).setSourceType(SourceType.JAMBOX.toString()); dataImport.setImportStatus(false).setSourceType("JAMBOX");
this.save(dataImport); this.save(dataImport);
} }
@ -136,21 +131,21 @@ public class DataImportServiceImpl extends ServiceImpl<DataImportMapper, DataImp
*/ */
@Override @Override
public void importNow(DataImport dataImport) { public void importNow(DataImport dataImport) {
//读取数据 // //读取数据
DataImportParamsDto dataImportParamsDto = new DataImportParamsDto(); // DataImportParamsDto dataImportParamsDto = new DataImportParamsDto();
dataImportParamsDto.setFileUrl(dataImport.getFileUrl()).setEmptyTag(dataImport.getIsClear() ? 1 : 0).setUploadId(dataImport.getId()); // dataImportParamsDto.setFileUrl(dataImport.getFileUrl()).setEmptyTag(dataImport.getIsClear() ? 1 : 0).setUploadId(dataImport.getId());
if (SourceType.valueOf(dataImport.getSourceType()) == SourceType.JAMBOX) { // if (StringUtils.equals(dataImport.getSourceType(), "JAMBOX")) {
StoreExtend storeExtend = SpringUtils.getBean(StoreExtendService.class).queryChain().where(STORE_EXTEND.STORE_ID.eq(dataImport.getStoreId())).one(); // StoreExtend storeExtend = SpringUtils.getBean(StoreExtendService.class).queryChain().where(STORE_EXTEND.STORE_ID.eq(dataImport.getStoreId())).one();
dataImportParamsDto.setStoreId(storeExtend.getStoreCloudId()); // dataImportParamsDto.setStoreId(storeExtend.getStoreCloudId());
} else { // } else {
dataImportParamsDto.setStoreId(dataImport.getStoreId()); // dataImportParamsDto.setStoreId(dataImport.getStoreId());
} // }
this.updateChain().set(DATA_IMPORT.IMPORT_STATUS, true).where(DATA_IMPORT.ID.eq(dataImport.getId())).update(); // this.updateChain().set(DATA_IMPORT.IMPORT_STATUS, true).where(DATA_IMPORT.ID.eq(dataImport.getId())).update();
try { // try {
SpringUtils.getBean(RestTemplate.class).postForObject(JamboxCloudUrl.DATA_IMPORT, dataImportParamsDto, String.class); // SpringUtils.getBean(RestTemplate.class).postForObject(JamboxCloudUrl.DATA_IMPORT, dataImportParamsDto, String.class);
} catch (Exception e) { // } catch (Exception e) {
log.info("数据导入超时,导入id为：{}", dataImport.getId()); // log.info("数据导入超时,导入id为：{}", dataImport.getId());
} // }
} }
/** /**
@ -276,8 +271,7 @@ public class DataImportServiceImpl extends ServiceImpl<DataImportMapper, DataImp
@Override @Override
public void onException(Exception exception, AnalysisContext context) { public void onException(Exception exception, AnalysisContext context) {
// 如果是某一个单元格的转换异常 能获取到具体行号 如果要获取头的信息 配合invokeHeadMap使用 // 如果是某一个单元格的转换异常 能获取到具体行号 如果要获取头的信息 配合invokeHeadMap使用
if (exception instanceof ExcelDataConvertException) { if (exception instanceof ExcelDataConvertException excelDataConvertException) {
ExcelDataConvertException excelDataConvertException = (ExcelDataConvertException) exception;
throw new ServiceException("第" + (excelDataConvertException.getRowIndex() + 1) + "行，第" + (excelDataConvertException.getColumnIndex() + 1) + "列解析异常，数据为:" + excelDataConvertException.getCellData()); throw new ServiceException("第" + (excelDataConvertException.getRowIndex() + 1) + "行，第" + (excelDataConvertException.getColumnIndex() + 1) + "列解析异常，数据为:" + excelDataConvertException.getCellData());
} else { } else {
throw new ServiceException(exception.getMessage()); throw new ServiceException(exception.getMessage());
@ -287,6 +281,7 @@ public class DataImportServiceImpl extends ServiceImpl<DataImportMapper, DataImp
if (cachedDataList.isEmpty()){ if (cachedDataList.isEmpty()){
throw new ServiceException("导入数据为空,请检查文件内容,按照模板格式导入"); throw new ServiceException("导入数据为空,请检查文件内容,按照模板格式导入");
} }
assert fileName != null;
tempFile = File.createTempFile(fileName, ".xlsx"); tempFile = File.createTempFile(fileName, ".xlsx");
log.info("文件名：{};临时文件地址: {}", fileName, tempFile.getPath()); log.info("文件名：{};临时文件地址: {}", fileName, tempFile.getPath());
EasyExcel.write(tempFile.getPath(), DataImportDto.class) EasyExcel.write(tempFile.getPath(), DataImportDto.class)

180
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/OamMallServiceImpl.java
View File

@ -1,180 +0,0 @@
package com.cpop.oam.business.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.cpop.common.utils.StringUtils;
import com.cpop.common.utils.bean.BeanUtils;
import com.cpop.core.base.entity.PageDomain;
import com.cpop.system.framework.enums.InitRoleEnum;
import com.cpop.core.base.enums.UserType;
import com.cpop.core.base.exception.ServiceException;
import com.cpop.core.base.table.SysUser;
import com.cpop.core.utils.*;
import com.cpop.core.utils.SqlUtils;
import com.cpop.core.utils.uuid.IdUtils;
import com.cpop.oam.business.bo.MallStaffBo;
import com.cpop.oam.business.service.OamMallService;
import com.cpop.oam.business.vo.MallStaffPageVo;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.core.row.*;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.Arrays;
import static com.cpop.core.base.table.table.SysUserTableDef.SYS_USER;
/**
* @author DB
* @createTime 2023/11/09 14:42
* @description
*/
@Service("oamMallService")
public class OamMallServiceImpl implements OamMallService {
/**
* @descriptions 查询商城管理员分页列表
* @author DB
* @date 2023/11/09 14:47
* @return: com.mybatisflex.core.paginate.Page<com.cpop.oam.business.vo.MallStaffPageVo>
*/
@Override
public Page<MallStaffPageVo> getMallStaffPage(String brandIds, String name) {
PageDomain pageDomain = SqlUtils.getInstance().getPageDomain();
QueryWrapper queryWrapper = QueryWrapper.create();
if (StringUtils.isNotBlank(name)) {
queryWrapper.and("name like ?", name + "%");
}
if (StringUtils.isNotBlank(brandIds)) {
queryWrapper.in("cp_mall_role_brand.brand_id", Arrays.asList(brandIds.split(",")));
}
Page<Row> rowPage = Db.paginate("cp_mall_staff", pageDomain.getPageNum(), pageDomain.getPageSize(),
queryWrapper.select("cp_mall_staff.*")
.select(SYS_USER.USER_NAME, SYS_USER.AVATAR, SYS_USER.EMAIL, SYS_USER.NICK_NAME, SYS_USER.PASSWORD, SYS_USER.PHONE_NUMBER, SYS_USER.SEX, SYS_USER.STATUS)
//角色
.select("cp_sys_role.role_name", "cp_sys_role.id as roleId")
//品牌
.select("cp_sys_brand.id as brandId", "cp_sys_brand.brand_name")
.from("cp_mall_staff")
.leftJoin(SYS_USER).on("cp_sys_user.id = cp_mall_staff.user_id")
.leftJoin("cp_mall_role_brand").on("cp_mall_role_brand.id = cp_mall_staff.role_brand_id")
.leftJoin("cp_sys_role").on("cp_sys_role.id = cp_mall_role_brand.role_id")
.leftJoin("cp_sys_brand").on("cp_sys_brand.id = cp_mall_role_brand.brand_id")
.where(SYS_USER.USER_TYPE.eq(UserType.MALL_USER))
.and("cp_mall_staff.is_delete = 0"));
return rowPage.map(item -> RowUtil.toEntity(item, MallStaffPageVo.class));
}
/**
* @descriptions 新增管理员
* @author DB
* @date 2023/11/10 12:14
* @param bo 请求参数
* @return: void
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void insertAdmin(MallStaffBo bo) {
//先添加用户信息
SysUser sysUser;
if (validatedUserInfo(bo)) {
throw new ServiceException(MessageUtils.message("i18n_alert_userOrPhoneOrEmailIsExist"));
} else {
//用户名-手机-邮箱都需要做唯一校验
sysUser = BeanUtils.mapToClass(bo, SysUser.class);
//解密与重设密码
decryptAndResetPasswords(sysUser);
sysUser.setId(IdUtils.fastSimpleUUID());
//获取当前创建人员信息
LoginUser loginUser = SecurityUtils.getInstance().getLoginUser();
sysUser.setCreateUserId(loginUser.getUserId());
sysUser.setUpdateUserId(loginUser.getUserId());
sysUser.setUserType(UserType.MALL_USER.toString());
SpringUtils.getBean(CoreService.class).insertSysUser(sysUser);
}
LocalDateTime now = LocalDateTime.now();
//创建中间表
Row roleBrand = Row.ofKey(RowKey.SNOW_FLAKE_ID);
roleBrand.set("brand_id", bo.getBrandId())
.set("role_id", InitRoleEnum.SUPER_MALL_ROLE.getId())
.set("create_time", now)
.set("update_time", now)
.set("create_user_id", 1)
.set("update_user_id", 1);
Db.insert("cp_mall_role_brand",roleBrand);
Row mallStaff = Row.ofKey(RowKey.SNOW_FLAKE_ID);
mallStaff.set("name", bo.getName())
.set("role_brand_id", roleBrand.getString("id"))
.set("user_id", sysUser.getId())
.set("create_time", now)
.set("update_time", now)
.set("create_user_id", 1)
.set("update_user_id", 1);
long count = DbChain.table("cp_j_brand_extend").where("brand_id = ?", bo.getBrandId()).count();
if (count > 0) {
mallStaff.set("source_type", SourceType.JAMBOX.toString());
} else {
mallStaff.set("source_type", SourceType.COMMON.toString());
}
Db.insert("cp_mall_staff", mallStaff);
}
/**
* @descriptions 删除管理员
* @author DB
* @date 2023/11/10 14:34
* @param id 主键
* @return: void
*/
@Override
public void removeAdmin(String id) {
//查询员工信息
Row staff = DbChain.table("cp_mall_staff").where("id = ?", id).one();
if (null != staff) {
DbChain.table("cp_mall_staff")
.set("is_delete", 1)
.where("id = ?", id)
.update();
DbChain.table("cp_mall_role_brand")
.where("id = ?", staff.getString("roleBrandId"))
.remove();
//删除系统用户
SpringUtils.getBean(CoreService.class).removeSysUserById(staff.getString("userId"));
}
}
/**
* @Description: 用户名-手机-邮箱都需要做唯一校验
* @param bo 请求参数
* @return Boolean 通过/未通过
* @Author DB
* @Date: 2023/5/11 11:02
**/
private Boolean validatedUserInfo(MallStaffBo bo) {
long count = DbChain.table(SYS_USER)
//用户名
.where(SYS_USER.USER_NAME.eq(bo.getUserName()))
//手机号
.or(SYS_USER.PHONE_NUMBER.eq(bo.getPhoneNumber()))
.count();
if (StringUtils.isNotBlank(bo.getUserId())) {
return count > 1;
} else {
return count > 0;
}
}
/**
* @Description: 解密与重设密码
* @param sysUser 系统用户
* @Author: DB
* @Date: 2023/5/11 11:03
**/
private void decryptAndResetPasswords(SysUser sysUser) {
//先用rsa解密
String password = SpringUtils.getBean(RsaUtils.class).decrypt(sysUser.getPassword());
//再加密
sysUser.setPassword(SpringUtils.getBean(PasswordEncoder.class).encode(password));
}
}

55
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/OamWxCpServiceImpl.java
View File

@ -1,11 +1,12 @@
package com.cpop.oam.business.service.impl; package com.cpop.oam.business.service.impl;
import com.cpop.common.utils.StringUtils;
import com.cpop.system.framework.enums.InitRoleEnum;
import com.cpop.core.base.enums.UserType; import com.cpop.core.base.enums.UserType;
import com.cpop.core.base.exception.ServiceException; import com.cpop.core.base.exception.ServiceException;
import com.cpop.core.base.table.SysUser; import com.cpop.core.base.table.User;
import com.cpop.core.utils.*; import com.cpop.core.service.UserService;
import com.cpop.core.utils.RsaUtils;
import com.cpop.core.utils.SpringUtils;
import com.cpop.core.utils.StringUtils;
import com.cpop.core.utils.uuid.IdUtils; import com.cpop.core.utils.uuid.IdUtils;
import com.cpop.oam.business.bo.StaffBo; import com.cpop.oam.business.bo.StaffBo;
import com.cpop.oam.business.entity.Dept; import com.cpop.oam.business.entity.Dept;
@ -17,10 +18,12 @@ import com.cpop.oam.business.service.StaffMidDeptService;
import com.cpop.oam.business.service.StaffService; import com.cpop.oam.business.service.StaffService;
import com.cpop.oam.business.vo.WxCpLoginVo; import com.cpop.oam.business.vo.WxCpLoginVo;
import com.cpop.oam.framework.config.wxCp.WxCpConfiguration; import com.cpop.oam.framework.config.wxCp.WxCpConfiguration;
import com.cpop.system.framework.enums.InitRoleEnum;
import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.core.row.Db; import com.mybatisflex.core.row.Db;
import com.mybatisflex.core.row.Row; import com.mybatisflex.core.row.Row;
import com.mybatisflex.core.row.RowUtil; import com.mybatisflex.core.row.RowUtil;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.error.WxErrorException;
import me.chanjar.weixin.cp.api.WxCpOAuth2Service; import me.chanjar.weixin.cp.api.WxCpOAuth2Service;
@ -32,28 +35,26 @@ import me.chanjar.weixin.cp.bean.WxCpUserDetail;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletRequest;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.cpop.core.base.table.table.SysUserTableDef.SYS_USER; import static com.cpop.core.base.table.table.UserTableDef.USER;
import static com.cpop.oam.business.entity.table.DeptTableDef.DEPT; import static com.cpop.oam.business.entity.table.DeptTableDef.DEPT;
import static com.cpop.oam.business.entity.table.StaffTableDef.STAFF; import static com.cpop.oam.business.entity.table.StaffTableDef.STAFF;
/** /**
* @author DB * @author DB
* @createTime 2023/11/17 9:42 * @since 2023/11/17 9:42
* @description Oam暴露的企业微信接口 * Oam暴露的企业微信接口
*/ */
@Slf4j @Slf4j
@Service("oamWxCpService") @Service("oamWxCpService")
public class OamWxCpServiceImpl implements OamWxCpService { public class OamWxCpServiceImpl implements OamWxCpService {
/** /**
* @descriptions 同步企业微信部门 * 同步企业微信部门
* @author DB * @author DB
* @date 2023/11/15 16:56 * @since 2023/11/15 16:56
* @return: void
*/ */
@Override @Override
public void syncWxCpDept() { public void syncWxCpDept() {
@ -85,12 +86,11 @@ public class OamWxCpServiceImpl implements OamWxCpService {
} }
/** /**
* @descriptions 递归保存子部门 * 递归保存子部门
* @author DB * @author DB
* @date 2023/11/16 16:06 * @since 2023/11/16 16:06
* @param wxCpDepartList 部门id * @param wxCpDepartList 部门id
* @param parentDept 父部门 * @param parentDept 父部门
* @return: void
*/ */
private void recursionSonDept(List<WxCpDepart> wxCpDepartList, Dept parentDept) { private void recursionSonDept(List<WxCpDepart> wxCpDepartList, Dept parentDept) {
List<Dept> deptList = new ArrayList<Dept>(); List<Dept> deptList = new ArrayList<Dept>();
@ -119,10 +119,9 @@ public class OamWxCpServiceImpl implements OamWxCpService {
} }
/** /**
* @descriptions 同步企业微信员工 * 同步企业微信员工
* @author DB * @author DB
* @date 2023/11/16 17:04 * @since 2023/11/16 17:04
* @return: void
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@ -132,9 +131,9 @@ public class OamWxCpServiceImpl implements OamWxCpService {
List<WxCpUser> wxCpUsers = cpService.getUserService().listByDepartment(1L, true, 0); List<WxCpUser> wxCpUsers = cpService.getUserService().listByDepartment(1L, true, 0);
if (!wxCpUsers.isEmpty()) { if (!wxCpUsers.isEmpty()) {
// 批量插入用户 // 批量插入用户
Map<SysUser, WxCpUser> userWxCpUserMap = new HashMap<>(); Map<User, WxCpUser> userWxCpUserMap = new HashMap<>();
wxCpUsers.forEach(item -> { wxCpUsers.forEach(item -> {
SysUser sysUser = new SysUser(); User sysUser = new User();
sysUser.setId(IdUtils.fastSimpleUUID()) sysUser.setId(IdUtils.fastSimpleUUID())
.setStatus(item.getStatus() == 1) .setStatus(item.getStatus() == 1)
.setUserType(UserType.OAM_USER.toString()) .setUserType(UserType.OAM_USER.toString())
@ -142,7 +141,7 @@ public class OamWxCpServiceImpl implements OamWxCpService {
sysUser.setUpdateUserId("1"); sysUser.setUpdateUserId("1");
userWxCpUserMap.put(sysUser, item); userWxCpUserMap.put(sysUser, item);
}); });
Db.executeBatch(userWxCpUserMap.keySet(), CoreMapper.class, CoreMapper::insertSysUser); Db.executeBatch(userWxCpUserMap.keySet(), UserService.class, UserService::save);
List<Staff> staffList = new ArrayList<>(); List<Staff> staffList = new ArrayList<>();
// 批量创建用户 // 批量创建用户
userWxCpUserMap.forEach((key, value) -> { userWxCpUserMap.forEach((key, value) -> {
@ -175,11 +174,10 @@ public class OamWxCpServiceImpl implements OamWxCpService {
} }
/** /**
* @descriptions 根据code换取用户信息 * 根据code换取用户信息
* @author DB * @author DB
* @date 2023/11/20 18:19 * @since 2023/11/20 18:19
* @param code code * @param code code
* @return: void
*/ */
@Override @Override
public WxCpLoginVo loginUserInfoByCode(HttpServletRequest httpServletRequest, String code) { public WxCpLoginVo loginUserInfoByCode(HttpServletRequest httpServletRequest, String code) {
@ -193,14 +191,14 @@ public class OamWxCpServiceImpl implements OamWxCpService {
// 查询用户信息 // 查询用户信息
Row row = Db.selectOneByQuery("cp_sys_user", Row row = Db.selectOneByQuery("cp_sys_user",
QueryWrapper.create() QueryWrapper.create()
.select(SYS_USER.ALL_COLUMNS) .select(USER.ALL_COLUMNS)
.leftJoin(STAFF) .leftJoin(STAFF)
.on(STAFF.USER_ID.eq(SYS_USER.ID)) .on(STAFF.USER_ID.eq(USER.ID))
.where(STAFF.WX_CP_USER_ID.eq(wxCpUserId))); .where(STAFF.WX_CP_USER_ID.eq(wxCpUserId)));
if (null == row) { if (null == row) {
throw new ServiceException("请先在企微上的Oam应用中进行注册"); throw new ServiceException("请先在企微上的Oam应用中进行注册");
} }
SysUser sysUser = RowUtil.toEntity(row, SysUser.class); User sysUser = RowUtil.toEntity(row, User.class);
return new WxCpLoginVo(sysUser.getUserName(), sysUser.getRsaPassword()); return new WxCpLoginVo(sysUser.getUserName(), sysUser.getRsaPassword());
} catch (WxErrorException e) { } catch (WxErrorException e) {
throw new ServiceException(e.getMessage()); throw new ServiceException(e.getMessage());
@ -208,12 +206,11 @@ public class OamWxCpServiceImpl implements OamWxCpService {
} }
/** /**
* @descriptions 企微的o2认证可查询用户敏感信息 * 企微的o2认证可查询用户敏感信息
* @author DB * @author DB
* @date 2023/11/21 15:31 * @since 2023/11/21 15:31
* @param agentId 应用id * @param agentId 应用id
* @param code 授权码 * @param code 授权码
* @return: void
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)

21
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/StaffServiceImpl.java
View File

@ -13,14 +13,16 @@ import com.cpop.core.service.UserService;
import com.cpop.core.utils.*; import com.cpop.core.utils.*;
import com.cpop.core.utils.bean.BeanUtils; import com.cpop.core.utils.bean.BeanUtils;
import com.cpop.core.utils.uuid.IdUtils; import com.cpop.core.utils.uuid.IdUtils;
import com.cpop.jambox.framework.constant.JamboxCloudUrl;
import com.cpop.oam.business.bo.*; import com.cpop.oam.business.bo.*;
import com.cpop.oam.business.entity.Staff; import com.cpop.oam.business.entity.Staff;
import com.cpop.oam.business.entity.StaffMidDept; import com.cpop.oam.business.entity.StaffMidDept;
import com.cpop.oam.business.mapper.StaffMapper; import com.cpop.oam.business.mapper.StaffMapper;
import com.cpop.oam.business.service.StaffMidDeptService; import com.cpop.oam.business.service.StaffMidDeptService;
import com.cpop.oam.business.service.StaffService; import com.cpop.oam.business.service.StaffService;
import com.cpop.oam.business.vo.*; import com.cpop.oam.business.vo.OperationLogVo;
import com.cpop.oam.business.vo.StaffInfoVo;
import com.cpop.oam.business.vo.StaffPageVo;
import com.cpop.oam.business.vo.StaffVo;
import com.cpop.oam.framework.constant.OamConfigKey; import com.cpop.oam.framework.constant.OamConfigKey;
import com.cpop.oam.framework.enums.OamConfigEnum; import com.cpop.oam.framework.enums.OamConfigEnum;
import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.paginate.Page;
@ -32,7 +34,6 @@ import com.mybatisflex.spring.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.RestTemplate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
@ -385,13 +386,13 @@ public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements
jsonBody.put("_type", "oamDel"); jsonBody.put("_type", "oamDel");
jsonBody.put("phone", User.getPhoneNumber()); jsonBody.put("phone", User.getPhoneNumber());
} }
JSONObject jsonObject = SpringUtils.getBean(RestTemplate.class).postForObject(JamboxCloudUrl.COMMON_CARD_URL, jsonBody, JSONObject.class); // JSONObject jsonObject = SpringUtils.getBean(RestTemplate.class).postForObject(JamboxCloudUrl.COMMON_CARD_URL, jsonBody, JSONObject.class);
assert jsonObject != null; // assert jsonObject != null;
if (!jsonObject.getBoolean("success")) { // if (!jsonObject.getBoolean("success")) {
throw new ServiceException(jsonObject.getString("error")); // throw new ServiceException(jsonObject.getString("error"));
} else { // } else {
this.updateChain().set(STAFF.IS_OPERATION, bo.getIsOperation()).where(STAFF.ID.eq(bo.getId())).update(); // this.updateChain().set(STAFF.IS_OPERATION, bo.getIsOperation()).where(STAFF.ID.eq(bo.getId())).update();
} // }
} }
} }

68
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/TaskServiceImpl.java
View File

@ -1,17 +1,17 @@
package com.cpop.oam.business.service.impl; package com.cpop.oam.business.service.impl;
import com.alibaba.fastjson.JSONObject; import cn.dev33.satoken.stp.StpUtil;
import com.cpop.api.tencent.wxWork.handler.WebHookSendHandler; import com.cpop.api.tencent.wxWork.handler.WebHookSendHandler;
import com.cpop.common.constant.Constants;
import com.cpop.common.utils.DateUtils;
import com.cpop.common.utils.StringUtils;
import com.cpop.common.utils.bean.BeanUtils;
import com.cpop.core.base.entity.PageDomain; import com.cpop.core.base.entity.PageDomain;
import com.cpop.core.base.exception.ServiceException; import com.cpop.core.base.exception.ServiceException;
import com.cpop.core.base.table.SysConfig; import com.cpop.core.base.table.Config;
import com.cpop.core.constant.Constants;
import com.cpop.core.service.ConfigService;
import com.cpop.core.service.RedisService; import com.cpop.core.service.RedisService;
import com.cpop.core.utils.SpringUtils; import com.cpop.core.utils.SpringUtils;
import com.cpop.core.utils.SqlUtils; import com.cpop.core.utils.SqlUtils;
import com.cpop.core.utils.StringUtils;
import com.cpop.core.utils.bean.BeanUtils;
import com.cpop.oam.business.bo.*; import com.cpop.oam.business.bo.*;
import com.cpop.oam.business.entity.Staff; import com.cpop.oam.business.entity.Staff;
import com.cpop.oam.business.entity.Task; import com.cpop.oam.business.entity.Task;
@ -46,7 +46,7 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.Lock;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.cpop.core.base.table.table.SysUserTableDef.SYS_USER; import static com.cpop.core.base.table.table.UserTableDef.USER;
import static com.cpop.oam.business.entity.table.StaffTableDef.STAFF; import static com.cpop.oam.business.entity.table.StaffTableDef.STAFF;
import static com.cpop.oam.business.entity.table.TaskStaffGroupTableDef.TASK_STAFF_GROUP; import static com.cpop.oam.business.entity.table.TaskStaffGroupTableDef.TASK_STAFF_GROUP;
import static com.cpop.oam.business.entity.table.TaskTableDef.TASK; import static com.cpop.oam.business.entity.table.TaskTableDef.TASK;
@ -195,17 +195,16 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
*/ */
@Override @Override
public void insertIterationTask(TaskIterationBo bo) { public void insertIterationTask(TaskIterationBo bo) {
JSONObject loginUserInfo = SecurityUtils.getInstance().getLoginUserInfo();
Task entity = BeanUtils.mapToClass(bo, Task.class); Task entity = BeanUtils.mapToClass(bo, Task.class);
// 默认待审核 默认开发中 // 默认待审核 默认开发中
entity.setTaskStatus(0).setTaskItem(0).setTaskType(0).setRecordStaffId(loginUserInfo.getString("id")); entity.setTaskStatus(0).setTaskItem(0).setTaskType(0).setRecordStaffId(StpUtil.getLoginIdAsString());
this.save(entity); this.save(entity);
// 获取审核管理员手机号 // 获取审核管理员手机号
RedisService redisService = SpringUtils.getBean(RedisService.class); RedisService redisService = SpringUtils.getBean(RedisService.class);
String auditStaffPhone = redisService.getCacheObject(OamConfigEnum.AUDIT_STAFF_PHONE.getKey()); String auditStaffPhone = redisService.getCacheObject(OamConfigEnum.AUDIT_STAFF_PHONE.getKey());
if (StringUtils.isBlank(auditStaffPhone)) { if (StringUtils.isBlank(auditStaffPhone)) {
CoreService coreService = SpringUtils.getBean(CoreService.class); ConfigService configService = SpringUtils.getBean(ConfigService.class);
SysConfig sysConfig = coreService.selectConfigByKey(OamConfigEnum.AUDIT_STAFF_PHONE.getKey()); Config sysConfig = configService.getById(OamConfigEnum.AUDIT_STAFF_PHONE.getKey());
auditStaffPhone = sysConfig.getConfigValue(); auditStaffPhone = sysConfig.getConfigValue();
if (StringUtils.isBlank(auditStaffPhone)) { if (StringUtils.isBlank(auditStaffPhone)) {
throw new ServiceException("尚未配置审核管理员信息!"); throw new ServiceException("尚未配置审核管理员信息!");
@ -262,10 +261,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
task.setExpectedCompletionDate(now.plusDays(Integer.parseInt(dictValue.split(",")[1]) - 1)); task.setExpectedCompletionDate(now.plusDays(Integer.parseInt(dictValue.split(",")[1]) - 1));
} }
// 获取当前用户 // 获取当前用户
JSONObject loginUser = SecurityUtils.getInstance().getLoginUserInfo(); if (!Constants.SUPER_ADMIN.equals(StpUtil.getSession().getString("username"))) {
if (!Constants.SUPER_ADMIN.equals(loginUser.getString("userName"))) {
// 获取当前员工 // 获取当前员工
Staff staff = SpringUtils.getBean(StaffService.class).getOne(QueryWrapper.create().where(STAFF.USER_ID.eq(loginUser.getString("userId")))); Staff staff = SpringUtils.getBean(StaffService.class).getOne(QueryWrapper.create().where(STAFF.USER_ID.eq(StpUtil.getSession().getString("userId"))));
task.setResponsibleStaffId(staff.getId()); task.setResponsibleStaffId(staff.getId());
} }
this.updateById(task); this.updateById(task);
@ -276,7 +274,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
// 通知所有人 // 通知所有人
try { try {
SpringUtils.getBean(WebHookSendHandler.class).webHookSendText(WebHookKeyConstant.PRODUCT_BOT, SpringUtils.getBean(WebHookSendHandler.class).webHookSendText(WebHookKeyConstant.PRODUCT_BOT,
Collections.singletonList(loginUser.getString("phoneNumber")), Collections.singletonList(StpUtil.getSession().getString("phone")),
"==========任务领取==========" + "\n" + task.getTaskContent(), "==========任务领取==========" + "\n" + task.getTaskContent(),
false); false);
} catch (IOException e) { } catch (IOException e) {
@ -339,8 +337,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
} }
QueryWrapper queryWrapper = QueryWrapper.create(); QueryWrapper queryWrapper = QueryWrapper.create();
if (StringUtils.isNotBlank(staffId)){ if (StringUtils.isNotBlank(staffId)){
Row staff = Db.selectOneByQuery(SYS_USER.getTableName(), QueryWrapper.create().select(SYS_USER.PHONE_NUMBER) Row staff = Db.selectOneByQuery(USER.getTableName(), QueryWrapper.create().select(USER.PHONE_NUMBER)
.leftJoin(STAFF).on(STAFF.USER_ID.eq(SYS_USER.ID)) .leftJoin(STAFF).on(STAFF.USER_ID.eq(USER.ID))
.where(STAFF.ID.eq(staffId))); .where(STAFF.ID.eq(staffId)));
//对比当前员工是否是测试管理员 //对比当前员工是否是测试管理员
if (!Arrays.asList(testStaffPhones.split(",")).contains(staff.getString("phoneNumber"))) { if (!Arrays.asList(testStaffPhones.split(",")).contains(staff.getString("phoneNumber"))) {
@ -352,11 +350,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
.groupBy(TASK.ID); .groupBy(TASK.ID);
} }
} else { } else {
JSONObject loginUserInfo = SecurityUtils.getInstance().getLoginUserInfo();
//对比当前员工是否是测试管理员 //对比当前员工是否是测试管理员
if (!Arrays.asList(testStaffPhones.split(",")).contains(loginUserInfo.getString("phoneNumber"))) { if (!Arrays.asList(testStaffPhones.split(",")).contains(StpUtil.getSession().getString("phone"))) {
queryWrapper.and(TASK.TASK_STATUS.in(2, 3, 8, 9)) queryWrapper.and(TASK.TASK_STATUS.in(2, 3, 8, 9))
.and(TASK_STAFF_GROUP.STAFF_ID.eq(loginUserInfo.getString("id"))); .and(TASK_STAFF_GROUP.STAFF_ID.eq(StpUtil.getSession().getString("id")));
} else { } else {
//测试人员 //测试人员
queryWrapper.and(TASK.TASK_STATUS.in(3, 8, 9)) queryWrapper.and(TASK.TASK_STATUS.in(3, 8, 9))
@ -405,13 +402,12 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
//查询任务进度 //查询任务进度
Task task = this.getById(bo.getId()); Task task = this.getById(bo.getId());
//进行中转测试 //进行中转测试
JSONObject loginUserInfo = SecurityUtils.getInstance().getLoginUserInfo();
switch (bo.getTaskItem()) { switch (bo.getTaskItem()) {
//逾期 //逾期
case -1: case -1:
//判断当前任务状态 //判断当前任务状态
if (task.getTaskStatus() == 2) { if (task.getTaskStatus() == 2) {
if (!StringUtils.equals(task.getResponsibleStaffId(), loginUserInfo.getString("id"))) { if (!StringUtils.equals(task.getResponsibleStaffId(), StpUtil.getLoginIdAsString())) {
throw new ServiceException("当前操作员工不是当前任务主要负责人，不允许操作当前任务！"); throw new ServiceException("当前操作员工不是当前任务主要负责人，不允许操作当前任务！");
} }
if (task.getTaskProgress() == null || task.getTaskProgress().split(",").length < 5) { if (task.getTaskProgress() == null || task.getTaskProgress().split(",").length < 5) {
@ -424,7 +420,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
throw new ServiceException("当前任务未提交测试部署相关文件,不允许转交"); throw new ServiceException("当前任务未提交测试部署相关文件,不允许转交");
} }
task.setToDeployTime(LocalDateTime.now()).setTestToFinishUrl(bo.getTestToFinishUrl()).setTaskStatus(8); task.setToDeployTime(LocalDateTime.now()).setTestToFinishUrl(bo.getTestToFinishUrl()).setTaskStatus(8);
testStaffAddPoint(task, loginUserInfo); testStaffAddPoint(task, StpUtil.getLoginIdAsString());
LocalDate now = LocalDate.now(); LocalDate now = LocalDate.now();
LocalDate expectedCompletionDate = task.getExpectedCompletionDate(); LocalDate expectedCompletionDate = task.getExpectedCompletionDate();
//测试任务延期一天 //测试任务延期一天
@ -438,7 +434,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
break; break;
//转测试 //转测试
case 0: case 0:
if (!StringUtils.equals(task.getResponsibleStaffId(), loginUserInfo.getString("id"))) { if (!StringUtils.equals(task.getResponsibleStaffId(), StpUtil.getLoginIdAsString())) {
throw new ServiceException("当前操作员工不是当前任务主要负责人，不允许操作当前任务！"); throw new ServiceException("当前操作员工不是当前任务主要负责人，不允许操作当前任务！");
} }
if (task.getTaskProgress() == null || task.getTaskProgress().split(",").length < 5) { if (task.getTaskProgress() == null || task.getTaskProgress().split(",").length < 5) {
@ -452,7 +448,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
throw new ServiceException("当前任务未提交测试部署相关文件,不允许转交"); throw new ServiceException("当前任务未提交测试部署相关文件,不允许转交");
} }
task.setToDeployTime(LocalDateTime.now()).setTestToFinishUrl(bo.getTestToFinishUrl()).setTaskStatus(8).setTaskItem(2); task.setToDeployTime(LocalDateTime.now()).setTestToFinishUrl(bo.getTestToFinishUrl()).setTaskStatus(8).setTaskItem(2);
testStaffAddPoint(task, loginUserInfo); testStaffAddPoint(task, StpUtil.getLoginIdAsString());
break; break;
default: default:
} }
@ -482,11 +478,11 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
* @since 2023/12/21 * @since 2023/12/21
* @param task 任务 * @param task 任务
*/ */
private void testStaffAddPoint(Task task, JSONObject loginUserInfo) { private void testStaffAddPoint(Task task, String id) {
//计算绩点 //计算绩点
double v = task.getTaskWeight() * 0.2; double v = task.getTaskWeight() * 0.2;
TaskStaffGroup taskStaffGroup = new TaskStaffGroup(); TaskStaffGroup taskStaffGroup = new TaskStaffGroup();
taskStaffGroup.setTaskId(task.getId()).setStaffId(loginUserInfo.getString("id")).setGradePoint((int) v).setRemark("测试员工获取绩点"); taskStaffGroup.setTaskId(task.getId()).setStaffId(id).setGradePoint((int) v).setRemark("测试员工获取绩点");
SpringUtils.getBean(TaskStaffGroupService.class).save(taskStaffGroup); SpringUtils.getBean(TaskStaffGroupService.class).save(taskStaffGroup);
} }
@ -575,8 +571,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
private void isTaskResponsibleStaff(String taskId) { private void isTaskResponsibleStaff(String taskId) {
// 获取任务 // 获取任务
Task task = this.getById(taskId); Task task = this.getById(taskId);
JSONObject loginUserInfo = SecurityUtils.getInstance().getLoginUserInfo(); if (!StringUtils.equals(task.getResponsibleStaffId(), StpUtil.getLoginIdAsString())) {
if (!StringUtils.equals(task.getResponsibleStaffId(), loginUserInfo.getString("id"))) {
throw new ServiceException("当前操作员工不是当前任务主要负责人，不允许操作当前任务！"); throw new ServiceException("当前操作员工不是当前任务主要负责人，不允许操作当前任务！");
} }
} }
@ -603,7 +598,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
firstDay = date.with(TemporalAdjusters.firstDayOfMonth()); firstDay = date.with(TemporalAdjusters.firstDayOfMonth());
} else { } else {
// 查询当月 // 查询当月
DateUtils.getDate();
LocalDate now = LocalDate.now(); LocalDate now = LocalDate.now();
firstDay = now.with(TemporalAdjusters.firstDayOfMonth()); firstDay = now.with(TemporalAdjusters.firstDayOfMonth());
} }
@ -649,13 +643,14 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
Long finishGpa = statisticalGpa(taskStaffGroups.stream().filter(s -> finishTaskSet.contains(s.getTaskId())).collect(Collectors.toList())); Long finishGpa = statisticalGpa(taskStaffGroups.stream().filter(s -> finishTaskSet.contains(s.getTaskId())).collect(Collectors.toList()));
statisticsVo.setGpaOfTheMonth(finishGpa); statisticsVo.setGpaOfTheMonth(finishGpa);
} }
List<Date> allTheDateOfMonth; //TODO： 获取月付
List<Date> allTheDateOfMonth = new ArrayList<>();
// 有传入月份 // 有传入月份
if (StringUtils.isNotBlank(bo.getTaskMoth())) { if (StringUtils.isNotBlank(bo.getTaskMoth())) {
allTheDateOfMonth = DateUtils.getAllTheDateOfTheMonth(DateUtils.parseDate(bo.getTaskMoth() + "-15")); //allTheDateOfMonth = DateUtils.getAllTheDateOfTheMonth(DateUtils.parseDate(bo.getTaskMoth() + "-15"));
} else { } else {
// 获取当月日期数组并遍历 // 获取当月日期数组并遍历
allTheDateOfMonth = DateUtils.getAllTheDateOfTheMonth(new Date()); //allTheDateOfMonth = DateUtils.getAllTheDateOfTheMonth(new Date());
} }
allTheDateOfMonth.forEach(item -> { allTheDateOfMonth.forEach(item -> {
LocalDate localDate = item.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); LocalDate localDate = item.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
@ -744,9 +739,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
private String createDailyPaper(List<Task> taskList, Map<String, List<TaskStaffGroup>> taskStaffGroupMap) { private String createDailyPaper(List<Task> taskList, Map<String, List<TaskStaffGroup>> taskStaffGroupMap) {
//所有技术员工信息 //所有技术员工信息
Map<String, Staff> staffMap = SpringUtils.getBean(StaffService.class).queryChain() Map<String, Staff> staffMap = SpringUtils.getBean(StaffService.class).queryChain()
.leftJoin(SYS_USER).on(SYS_USER.ID.eq(STAFF.USER_ID)) .leftJoin(USER).on(USER.ID.eq(STAFF.USER_ID))
.where(STAFF.STAFF_TYPE.in(0, 2)) .where(STAFF.STAFF_TYPE.in(0, 2))
.and(SYS_USER.STATUS.eq(1)) .and(USER.STATUS.eq(1))
.list() .list()
.stream().collect(Collectors.toMap(Staff::getId, item -> item)); .stream().collect(Collectors.toMap(Staff::getId, item -> item));
StringBuilder dailyPaper = new StringBuilder(); StringBuilder dailyPaper = new StringBuilder();
@ -785,8 +780,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
queryWrapper.and(TASK_STAFF_GROUP.STAFF_ID.eq(staffId)); queryWrapper.and(TASK_STAFF_GROUP.STAFF_ID.eq(staffId));
} else { } else {
//获取当前用户信息 //获取当前用户信息
JSONObject loginUserInfo = SecurityUtils.getInstance().getLoginUserInfo(); queryWrapper.and(TASK_STAFF_GROUP.STAFF_ID.eq(StpUtil.getLoginIdAsString()));
queryWrapper.and(TASK_STAFF_GROUP.STAFF_ID.eq(loginUserInfo.getString("id")));
} }
if (startDate != null && endDate != null) { if (startDate != null && endDate != null) {
queryWrapper.and(dateFormat(TASK.TASK_RECEIPT_TIME, "%Y-%m-%d").between(startDate, endDate)); queryWrapper.and(dateFormat(TASK.TASK_RECEIPT_TIME, "%Y-%m-%d").between(startDate, endDate));

27
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/TaskStaffGroupServiceImpl.java
View File

@ -1,13 +1,11 @@
package com.cpop.oam.business.service.impl; package com.cpop.oam.business.service.impl;
import com.alibaba.fastjson.JSONObject; import cn.dev33.satoken.stp.StpUtil;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.cpop.api.tencent.wxWork.handler.WebHookSendHandler; import com.cpop.api.tencent.wxWork.handler.WebHookSendHandler;
import com.cpop.common.utils.StringUtils;
import com.cpop.common.utils.bean.BeanUtils;
import com.cpop.core.base.exception.ServiceException; import com.cpop.core.base.exception.ServiceException;
import com.cpop.core.utils.SpringUtils; import com.cpop.core.utils.SpringUtils;
import com.cpop.core.utils.StringUtils;
import com.cpop.core.utils.bean.BeanUtils;
import com.cpop.oam.business.bo.TaskStaffGroupBo; import com.cpop.oam.business.bo.TaskStaffGroupBo;
import com.cpop.oam.business.entity.Task; import com.cpop.oam.business.entity.Task;
import com.cpop.oam.business.entity.TaskStaffGroup; import com.cpop.oam.business.entity.TaskStaffGroup;
@ -18,6 +16,8 @@ import com.cpop.oam.business.service.TaskStaffGroupService;
import com.cpop.oam.business.vo.StaffInfoVo; import com.cpop.oam.business.vo.StaffInfoVo;
import com.cpop.oam.business.vo.TaskStaffGroupVo; import com.cpop.oam.business.vo.TaskStaffGroupVo;
import com.cpop.oam.framework.constant.WebHookKeyConstant; import com.cpop.oam.framework.constant.WebHookKeyConstant;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -71,8 +71,7 @@ public class TaskStaffGroupServiceImpl extends ServiceImpl<TaskStaffGroupMapper,
TaskService taskService = SpringUtils.getBean(TaskService.class); TaskService taskService = SpringUtils.getBean(TaskService.class);
Task task = taskService.getById(bo.getTaskId()); Task task = taskService.getById(bo.getTaskId());
// 当前操作员工是否是主要负责人，不是抛出异常 // 当前操作员工是否是主要负责人，不是抛出异常
JSONObject loginUserInfo = SecurityUtils.getInstance().getLoginUserInfo(); if (!StringUtils.equals(task.getResponsibleStaffId(), StpUtil.getLoginIdAsString())) {
if (!StringUtils.equals(task.getResponsibleStaffId(), loginUserInfo.getString("id"))) {
throw new ServiceException("当前操作员工不是当前任务主要负责人，不允许操作当前任务！"); throw new ServiceException("当前操作员工不是当前任务主要负责人，不允许操作当前任务！");
} }
// 查询当前添加的员工是否存在在此任务中 // 查询当前添加的员工是否存在在此任务中
@ -98,14 +97,14 @@ public class TaskStaffGroupServiceImpl extends ServiceImpl<TaskStaffGroupMapper,
this.updateById(responsibleStaff); this.updateById(responsibleStaff);
// 企微通知绩点调整人员 // 企微通知绩点调整人员
List<String> phoneList = new ArrayList<String>(); List<String> phoneList = new ArrayList<String>();
phoneList.add(loginUserInfo.getString("phoneNumber")); phoneList.add(StpUtil.getSession().getString("phone"));
// 获取新增员工信息 // 获取新增员工信息
StaffInfoVo staffInfo = SpringUtils.getBean(StaffService.class).getStaffInfo(bo.getStaffId()); StaffInfoVo staffInfo = SpringUtils.getBean(StaffService.class).getStaffInfo(bo.getStaffId());
phoneList.add(staffInfo.getPhoneNumber()); phoneList.add(staffInfo.getPhoneNumber());
try { try {
SpringUtils.getBean(WebHookSendHandler.class).webHookSendText(WebHookKeyConstant.PRODUCT_BOT, phoneList, SpringUtils.getBean(WebHookSendHandler.class).webHookSendText(WebHookKeyConstant.PRODUCT_BOT, phoneList,
"任务:" + task.getTaskContent() + "\n" + "任务:" + task.getTaskContent() + "\n" +
loginUserInfo.getString("name") + "您的绩点调整为" + responsibleStaff.getGradePoint() + "\n" + staffInfo.getName() StpUtil.getSession().getString("name") + "您的绩点调整为" + responsibleStaff.getGradePoint() + "\n" + staffInfo.getName()
+ "您新加入任务:" + task.getTaskContent() + "绩点为:" + bo.getGradePoint(), + "您新加入任务:" + task.getTaskContent() + "绩点为:" + bo.getGradePoint(),
false); false);
} catch (IOException e) { } catch (IOException e) {
@ -128,8 +127,7 @@ public class TaskStaffGroupServiceImpl extends ServiceImpl<TaskStaffGroupMapper,
if (null == task) { if (null == task) {
throw new ServiceException("获取任务失败！请联系相关人员!"); throw new ServiceException("获取任务失败！请联系相关人员!");
} }
JSONObject loginUserInfo = SecurityUtils.getInstance().getLoginUserInfo(); if (!StringUtils.equals(task.getResponsibleStaffId(), StpUtil.getLoginIdAsString())) {
if (!StringUtils.equals(task.getResponsibleStaffId(), loginUserInfo.getString("id"))) {
throw new ServiceException("当前操作员工不是当前任务主要负责人，不允许操作当前任务！"); throw new ServiceException("当前操作员工不是当前任务主要负责人，不允许操作当前任务！");
} }
if (StringUtils.equals(bo.getStaffId(), task.getResponsibleStaffId())) { if (StringUtils.equals(bo.getStaffId(), task.getResponsibleStaffId())) {
@ -167,14 +165,14 @@ public class TaskStaffGroupServiceImpl extends ServiceImpl<TaskStaffGroupMapper,
.update(); .update();
// 企微通知绩点调整人员 // 企微通知绩点调整人员
List<String> phoneList = new ArrayList<String>(); List<String> phoneList = new ArrayList<String>();
phoneList.add(loginUserInfo.getString("phoneNumber")); phoneList.add(StpUtil.getSession().getString("phone"));
// 获取新增员工信息 // 获取新增员工信息
StaffInfoVo staffInfo = SpringUtils.getBean(StaffService.class).getStaffInfo(bo.getStaffId()); StaffInfoVo staffInfo = SpringUtils.getBean(StaffService.class).getStaffInfo(bo.getStaffId());
phoneList.add(staffInfo.getPhoneNumber()); phoneList.add(staffInfo.getPhoneNumber());
try { try {
SpringUtils.getBean(WebHookSendHandler.class).webHookSendText(WebHookKeyConstant.PRODUCT_BOT, phoneList, SpringUtils.getBean(WebHookSendHandler.class).webHookSendText(WebHookKeyConstant.PRODUCT_BOT, phoneList,
"任务:" + task.getTaskContent() + "\n" + "任务:" + task.getTaskContent() + "\n" +
loginUserInfo.getString("name") + "您的绩点调整为" + responsibleStaffTaskInfo.getGradePoint() + "\n" StpUtil.getSession().getString("name") + "您的绩点调整为" + responsibleStaffTaskInfo.getGradePoint() + "\n"
+ staffInfo.getName() + "您的绩点调整为:" + bo.getGradePoint(), + staffInfo.getName() + "您的绩点调整为:" + bo.getGradePoint(),
false); false);
} catch (IOException e) { } catch (IOException e) {
@ -195,8 +193,7 @@ public class TaskStaffGroupServiceImpl extends ServiceImpl<TaskStaffGroupMapper,
TaskStaffGroup taskStaffGroup = this.getById(id); TaskStaffGroup taskStaffGroup = this.getById(id);
TaskService taskService = SpringUtils.getBean(TaskService.class); TaskService taskService = SpringUtils.getBean(TaskService.class);
Task task = taskService.getById(taskStaffGroup.getTaskId()); Task task = taskService.getById(taskStaffGroup.getTaskId());
JSONObject loginUserInfo = SecurityUtils.getInstance().getLoginUserInfo(); if (!StringUtils.equals(task.getResponsibleStaffId(), StpUtil.getLoginIdAsString())) {
if (!StringUtils.equals(task.getResponsibleStaffId(), loginUserInfo.getString("id"))) {
throw new ServiceException("当前操作员工不是当前任务主要负责人，不允许操作当前任务！"); throw new ServiceException("当前操作员工不是当前任务主要负责人，不允许操作当前任务！");
} }
// 不允许删除主要负责人 // 不允许删除主要负责人

56
Cpop-Oam/src/main/java/com/cpop/oam/business/vo/LoginUserInfoVo.java
View File

@ -1,56 +0,0 @@
package com.cpop.oam.business.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 登录用户的基本信息
* 用于记录到token的信息使用
* @author Gewj
*
*/
@Data
@Accessors(chain = true)
@ApiModel
public class LoginUserInfoVo {
/**
* 用户id
*/
@ApiModelProperty("用户id")
private String userId;
/**
* 头像
*/
@ApiModelProperty("头像")
private String avatar;
/**
* 登录用户名
*/
@ApiModelProperty("登录用户名")
private String username;
/**
* 真实姓名
*/
@ApiModelProperty("真实姓名")
private String realName;
/**
* 介绍
*/
@ApiModelProperty("介绍")
private String desc;
/**
* 用户首页路由
*/
@ApiModelProperty("用户首页路由")
private String homePath;
}

126
Cpop-Oam/src/main/java/com/cpop/oam/business/vo/MallStaffPageVo.java
View File

@ -1,126 +0,0 @@
package com.cpop.oam.business.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* @author DB
* @createTime 2023/10/20 11:06
* @description
*/
@Data
@Accessors(chain = true)
@ApiModel(value = "商城员工分页返回对象")
public class MallStaffPageVo implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@ApiModelProperty("主键")
private String id;
/**
* 姓名
*/
@ApiModelProperty("姓名")
private String name;
/**
* 用户id
*/
@ApiModelProperty("用户id")
private String userId;
/**
* 角色-品牌-id
*/
@ApiModelProperty("角色-品牌-id")
private String roleBrandId;
/**
* 品牌id
*/
@ApiModelProperty("品牌id")
private String brandId;
/**
* 品牌
*/
@ApiModelProperty("品牌")
private String brandName;
/**
* 用户名
*/
@ApiModelProperty("用户名")
private String userName;
/**
* 昵称
*/
@ApiModelProperty("昵称")
private String nickName;
/**
* 邮箱
*/
@ApiModelProperty("邮箱")
private String email;
/**
* 手机号
*/
@ApiModelProperty("手机号")
private String phoneNumber;
/**
* 性别(0:男;1:女)
*/
@ApiModelProperty("性别(0:男;1:女)")
private Boolean sex;
/**
* 头像
*/
@ApiModelProperty("头像")
private String avatar;
/**
* 状态(0:停用;1:启用)
*/
@ApiModelProperty("状态(0:停用;1:启用)")
private Boolean status;
/**
* 角色id
*/
@ApiModelProperty("角色id")
private String roleId;
/**
* 角色名
*/
@ApiModelProperty("角色名")
private String roleName;
/**
* 更新时间
*/
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private LocalDateTime updateTime;
/**
* 密码
*/
@ApiModelProperty("密码")
private String password;
}

40
Cpop-Oam/src/main/java/com/cpop/oam/business/vo/MenuRouteVo.java
View File

@ -1,12 +1,10 @@
package com.cpop.oam.business.vo; package com.cpop.oam.business.vo;
import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Column;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.List; import java.util.List;
/** /**
@ -17,101 +15,99 @@ import java.util.List;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "Menu对象", description = "") @Schema(description = "Menu对象")
public class MenuRouteVo implements Serializable { public class MenuRouteVo {
private static final long serialVersionUID = 1L;
/** /**
* 菜单ID * 菜单ID
*/ */
@ApiModelProperty("菜单ID") @Schema(description ="菜单ID")
private String id; private String id;
/** /**
* 父级菜单ID * 父级菜单ID
*/ */
@ApiModelProperty("父级菜单ID") @Schema(description ="父级菜单ID")
private String parentMenu; private String parentMenu;
/** /**
* 菜单名 * 菜单名
*/ */
@ApiModelProperty("菜单名") @Schema(description ="菜单名")
private String name; private String name;
/** /**
* 菜单图标 * 菜单图标
*/ */
@ApiModelProperty("菜单图标") @Schema(description ="菜单图标")
private String icon; private String icon;
/** /**
* 菜单路由，父菜单为空 * 菜单路由，父菜单为空
*/ */
@ApiModelProperty("菜单路由，父菜单为空") @Schema(description ="菜单路由，父菜单为空")
private String component; private String component;
/** /**
* 标记菜单的状态 0:禁用 1：正常（根据权限正常显示） * 标记菜单的状态 0:禁用 1：正常（根据权限正常显示）
*/ */
@ApiModelProperty("标记菜单的状态 0:禁用 1：正常（根据权限正常显示）") @Schema(description ="标记菜单的状态 0:禁用 1：正常（根据权限正常显示）")
private Boolean status; private Boolean status;
/** /**
* 用户类型，1管理员，2审计管理员，3安全管理员，4普通用户 * 用户类型，1管理员，2审计管理员，3安全管理员，4普通用户
*/ */
@ApiModelProperty("用户类型，1管理员，2审计管理员，3安全管理员，4普通用户") @Schema(description ="用户类型，1管理员，2审计管理员，3安全管理员，4普通用户")
private String type; private String type;
/** /**
* 权限 * 权限
*/ */
@ApiModelProperty("权限") @Schema(description ="权限")
private String permission; private String permission;
/** /**
* 重定向路径，一级菜单有值 * 重定向路径，一级菜单有值
*/ */
@ApiModelProperty("重定向路径，一级菜单有值") @Schema(description ="重定向路径，一级菜单有值")
private String redirect; private String redirect;
/** /**
* 排序，值越小越靠前，一级菜单有值 * 排序，值越小越靠前，一级菜单有值
*/ */
@ApiModelProperty("排序，值越小越靠前，一级菜单有值") @Schema(description ="排序，值越小越靠前，一级菜单有值")
private Integer orderNo; private Integer orderNo;
/** /**
* 子菜单集 * 子菜单集
*/ */
@Column(ignore = true) @Column(ignore = true)
@ApiModelProperty("子菜单集") @Schema(description ="子菜单集")
private List<MenuRouteVo> children; private List<MenuRouteVo> children;
/** /**
* 路由地址 * 路由地址
*/ */
@ApiModelProperty("路由地址") @Schema(description ="路由地址")
private String path; private String path;
/** /**
* 标题 * 标题
*/ */
@ApiModelProperty("标题") @Schema(description ="标题")
private String title; private String title;
/** /**
* 隐藏菜单 * 隐藏菜单
*/ */
@ApiModelProperty("隐藏菜单") @Schema(description ="隐藏菜单")
private Boolean hideMenu; private Boolean hideMenu;
/** /**
* 内部定义类 * 内部定义类
*/ */
@Column(ignore = true) @Column(ignore = true)
@ApiModelProperty("内部定义类") @Schema(description ="内部定义类")
private Meta meta; private Meta meta;
/** /**

40
Cpop-Oam/src/main/java/com/cpop/oam/business/vo/MenuVo.java
View File

@ -1,12 +1,10 @@
package com.cpop.oam.business.vo; package com.cpop.oam.business.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
@ -18,100 +16,98 @@ import java.util.List;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(description = "菜单返回对象") @Schema(description = "菜单返回对象")
public class MenuVo implements Serializable { public class MenuVo {
private static final long serialVersionUID = 1L;
/** /**
* 菜单ID * 菜单ID
*/ */
@ApiModelProperty(value = "菜单ID") @Schema(description = "菜单ID")
private String id; private String id;
/** /**
* 父级菜单ID * 父级菜单ID
*/ */
@ApiModelProperty(value = "父级菜单ID") @Schema(description = "父级菜单ID")
private String parentMenu; private String parentMenu;
/** /**
* 菜单名称 * 菜单名称
*/ */
@ApiModelProperty(value = "菜单名称") @Schema(description = "菜单名称")
private String name; private String name;
/** /**
* 菜单图标 * 菜单图标
*/ */
@ApiModelProperty(value = "菜单图标") @Schema(description = "菜单图标")
private String icon; private String icon;
/** /**
* 菜单路由，父菜单为空 * 菜单路由，父菜单为空
*/ */
@ApiModelProperty(value = "菜单路由，父菜单为空") @Schema(description = "菜单路由，父菜单为空")
private String component; private String component;
/** /**
* 标记菜单的状态 0:禁用 1:启用（根据权限正常显示） * 标记菜单的状态 0:禁用 1:启用（根据权限正常显示）
*/ */
@ApiModelProperty(value = "标记菜单的状态 0:禁用 1:启用（根据权限正常显示）") @Schema(description = "标记菜单的状态 0:禁用 1:启用（根据权限正常显示）")
private Boolean status; private Boolean status;
/** /**
* 权限 * 权限
*/ */
@ApiModelProperty(value = "权限") @Schema(description = "权限")
private String permission; private String permission;
/** /**
* 重定向路径，一级菜单有值 * 重定向路径，一级菜单有值
*/ */
@ApiModelProperty(value = "重定向路径，一级菜单有值") @Schema(description = "重定向路径，一级菜单有值")
private String redirect; private String redirect;
/** /**
* 排序，值越小越靠前，一级菜单有值 * 排序，值越小越靠前，一级菜单有值
*/ */
@ApiModelProperty(value = "排序，值越小越靠前，一级菜单有值") @Schema(description = "排序，值越小越靠前，一级菜单有值")
private Integer orderNo; private Integer orderNo;
/** /**
* 路由地址 * 路由地址
*/ */
@ApiModelProperty(value = "路由地址") @Schema(description = "路由地址")
private String path; private String path;
/** /**
* 标题 * 标题
*/ */
@ApiModelProperty(value = "标题") @Schema(description = "标题")
private String title; private String title;
/** /**
* 子菜单集 * 子菜单集
*/ */
@ApiModelProperty(value = "子菜单集") @Schema(description = "子菜单集")
private List<MenuVo> children; private List<MenuVo> children;
/** /**
* 更新时间 * 更新时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
@ApiModelProperty(value = "更新时间") @Schema(description = "更新时间")
private LocalDateTime updateTime; private LocalDateTime updateTime;
/** /**
* 菜单类型，0:目录，1:菜单，2:按钮 * 菜单类型，0:目录，1:菜单，2:按钮
*/ */
@ApiModelProperty(value = "菜单类型，0:目录，1:菜单，2:按钮") @Schema(description = "菜单类型，0:目录，1:菜单，2:按钮")
private Integer type; private Integer type;
/** /**
* 隐藏菜单 * 隐藏菜单
*/ */
@ApiModelProperty(value = "隐藏菜单") @Schema(description = "隐藏菜单")
private Boolean hideMenu; private Boolean hideMenu;
} }

26
Cpop-Oam/src/main/java/com/cpop/oam/business/vo/RolePageVo.java
View File

@ -2,12 +2,10 @@ package com.cpop.oam.business.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Column;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
@ -19,58 +17,56 @@ import java.util.List;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "Role分页返回对象") @Schema(description = "Role分页返回对象")
public class RolePageVo implements Serializable { public class RolePageVo {
private static final long serialVersionUID = 1L;
/** /**
* 主键 * 主键
*/ */
@ApiModelProperty("主键") @Schema(description ="主键")
private String id; private String id;
/** /**
* 角色名称 * 角色名称
*/ */
@ApiModelProperty("角色名称") @Schema(description ="角色名称")
private String roleName; private String roleName;
/** /**
* 角色值 * 角色值
*/ */
@ApiModelProperty("角色值") @Schema(description ="角色值")
private String roleValue; private String roleValue;
/** /**
* 状态 * 状态
*/ */
@ApiModelProperty("状态") @Schema(description ="状态")
private Boolean status; private Boolean status;
/** /**
* 备注 * 备注
*/ */
@ApiModelProperty("备注") @Schema(description ="备注")
private String remark; private String remark;
/** /**
* 排序 * 排序
*/ */
@ApiModelProperty("排序") @Schema(description ="排序")
private Integer orderNo; private Integer orderNo;
/** /**
* 更新时间 * 更新时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
@ApiModelProperty("更新时间") @Schema(description ="更新时间")
private LocalDateTime updateTime; private LocalDateTime updateTime;
/** /**
* 角色所属菜单id集合 * 角色所属菜单id集合
*/ */
@ApiModelProperty("角色所属菜单id集合") @Schema(description ="角色所属菜单id集合")
@Column(ignore = true) @Column(ignore = true)
private List<String> menuIds; private List<String> menuIds;
} }

28
Cpop-Oam/src/main/java/com/cpop/oam/business/vo/TaskMonthStatisticsVo.java
View File

@ -1,12 +1,10 @@
package com.cpop.oam.business.vo; package com.cpop.oam.business.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.List; import java.util.List;
@ -18,63 +16,61 @@ import java.util.List;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "Task对象", description = "OAM-任务表") @Schema(description = "OAM-任务表")
public class TaskMonthStatisticsVo implements Serializable { public class TaskMonthStatisticsVo {
private static final long serialVersionUID = 1L;
/** /**
* 进行中 * 进行中
*/ */
@ApiModelProperty(value = "进行中") @Schema(description = "进行中")
private Long inProgress = 0L; private Long inProgress = 0L;
/** /**
* 已完成 * 已完成
*/ */
@ApiModelProperty(value = "已完成") @Schema(description = "已完成")
private Long haveCompleted = 0L; private Long haveCompleted = 0L;
/** /**
* 测试中 * 测试中
*/ */
@ApiModelProperty(value = "测试中") @Schema(description = "测试中")
private Long inTest = 0L; private Long inTest = 0L;
/** /**
* 已逾期 * 已逾期
*/ */
@ApiModelProperty(value = "已逾期") @Schema(description = "已逾期")
private Long overdue = 0L; private Long overdue = 0L;
/** /**
* 当月绩点 * 当月绩点
*/ */
@ApiModelProperty(value = "当月绩点") @Schema(description = "当月绩点")
private Long gpaOfTheMonth = 0L; private Long gpaOfTheMonth = 0L;
/** /**
* 月度数据统计对象集合 * 月度数据统计对象集合
*/ */
@ApiModelProperty(value = "月度数据统计对象集合") @Schema(description = "月度数据统计对象集合")
private List<DataStatisticsVo> vos; private List<DataStatisticsVo> vos;
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "月度数据统计对象", description = "OAM-任务表") @Schema(description = "OAM-任务表")
public class DataStatisticsVo { public class DataStatisticsVo {
/** /**
* 日期 * 日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(value = "日期") @Schema(description = "日期")
private LocalDate date; private LocalDate date;
/** /**
* 任务内容 * 任务内容
*/ */
@ApiModelProperty(value = "任务内容") @Schema(description = "任务内容")
private List<String> taskContents; private List<String> taskContents;
} }
} }

15
Cpop-Oam/src/main/java/com/cpop/oam/business/vo/TaskWorkOrderPageVo.java
View File

@ -1,8 +1,7 @@
package com.cpop.oam.business.vo; package com.cpop.oam.business.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -15,37 +14,37 @@ import java.time.LocalDateTime;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "TaskWorkOrderPageVo对象", description = "任务-工单-记录") @Schema(description = "任务-工单-记录")
public class TaskWorkOrderPageVo { public class TaskWorkOrderPageVo {
/** /**
* 工单id * 工单id
*/ */
@ApiModelProperty("工单id") @Schema(description ="工单id")
private String id; private String id;
/** /**
* 任务内容 * 任务内容
*/ */
@ApiModelProperty("任务内容") @Schema(description ="任务内容")
private String taskContent; private String taskContent;
/** /**
* 办结员工id * 办结员工id
*/ */
@ApiModelProperty("办结员工id") @Schema(description ="办结员工id")
private String finishStaffId; private String finishStaffId;
/** /**
* 办结员工 * 办结员工
*/ */
@ApiModelProperty("办结员工") @Schema(description ="办结员工")
private String finishStaffName; private String finishStaffName;
/** /**
* 办结时间 * 办结时间
*/ */
@ApiModelProperty("办结时间") @Schema(description ="办结时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime finishTime; private LocalDateTime finishTime;

72
Cpop-Oam/src/main/java/com/cpop/oam/business/vo/TaskWorkOrderReceiveDealPauseVo.java
View File

@ -1,12 +1,10 @@
package com.cpop.oam.business.vo; package com.cpop.oam.business.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
@ -17,75 +15,75 @@ import java.util.List;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "接收/处理/暂停中页面返回对象", description = "接收/处理/暂停中对象") @Schema(description = "接收/处理/暂停中对象")
public class TaskWorkOrderReceiveDealPauseVo { public class TaskWorkOrderReceiveDealPauseVo {
/** /**
* 待接收列表 * 待接收列表
*/ */
@ApiModelProperty(value = "待接收列表") @Schema(description = "待接收列表")
private List<Receive> receiveList; private List<Receive> receiveList;
/** /**
* 处理中列表 * 处理中列表
*/ */
@ApiModelProperty(value = "处理中列表") @Schema(description = "处理中列表")
private List<Deal> dealList; private List<Deal> dealList;
/** /**
* 暂停中列表 * 暂停中列表
*/ */
@ApiModelProperty(value = "暂停中列表") @Schema(description = "暂停中列表")
private List<Pause> pauseList; private List<Pause> pauseList;
/** /**
* 接收 * 接收
*/ */
@Data @Data
@ApiModel("待接收") @Schema(description = "待接收")
public static class Receive { public static class Receive {
/** /**
* 工单id * 工单id
*/ */
@ApiModelProperty(value = "工单id") @Schema(description = "工单id")
private String id; private String id;
/** /**
* 机构/品牌 * 机构/品牌
*/ */
@ApiModelProperty(value = "机构/品牌") @Schema(description = "机构/品牌")
private String brandName; private String brandName;
/** /**
* 校区/店铺 * 校区/店铺
*/ */
@ApiModelProperty(value = "校区/店铺") @Schema(description = "校区/店铺")
private String storeName; private String storeName;
/** /**
* 问题描述 * 问题描述
*/ */
@ApiModelProperty(value = "问题描述") @Schema(description = "问题描述")
private String taskContent; private String taskContent;
/** /**
* 手机号 * 手机号
*/ */
@ApiModelProperty(value = "手机号") @Schema(description = "手机号")
private String phoneNumber; private String phoneNumber;
/** /**
* 提交人 * 提交人
*/ */
@ApiModelProperty(value = "提交人") @Schema(description = "提交人")
private String recordStaffName; private String recordStaffName;
/** /**
* 提交时间 * 提交时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "提交时间") @Schema(description = "提交时间")
private LocalDateTime createTime; private LocalDateTime createTime;
} }
@ -94,69 +92,69 @@ public class TaskWorkOrderReceiveDealPauseVo {
* 接收 * 接收
*/ */
@Data @Data
@ApiModel("处理中") @Schema(description = "处理中")
public static class Deal { public static class Deal {
/** /**
* 工单id * 工单id
*/ */
@ApiModelProperty(value = "工单id") @Schema(description = "工单id")
private String id; private String id;
/** /**
* 机构/品牌 * 机构/品牌
*/ */
@ApiModelProperty(value = "机构/品牌") @Schema(description = "机构/品牌")
private String brandName; private String brandName;
/** /**
* 校区/店铺 * 校区/店铺
*/ */
@ApiModelProperty(value = "校区/店铺") @Schema(description = "校区/店铺")
private String storeName; private String storeName;
/** /**
* 问题描述 * 问题描述
*/ */
@ApiModelProperty(value = "问题描述") @Schema(description = "问题描述")
private String taskContent; private String taskContent;
/** /**
* 提交人 * 提交人
*/ */
@ApiModelProperty(value = "提交人") @Schema(description = "提交人")
private String recordStaffName; private String recordStaffName;
/** /**
* 提交时间 * 提交时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "提交时间") @Schema(description = "提交时间")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 接收人 * 接收人
*/ */
@ApiModelProperty(value = "接收人") @Schema(description = "接收人")
private String responsibleStaffName; private String responsibleStaffName;
/** /**
* 任务接收时间 * 任务接收时间
*/ */
@ApiModelProperty(value = "任务接收时间") @Schema(description = "任务接收时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime taskReceiptTime; private LocalDateTime taskReceiptTime;
/** /**
* 任务接收用时/min * 任务接收用时/min
*/ */
@ApiModelProperty(value = "任务接收用时/min") @Schema(description = "任务接收用时/min")
private Integer receivingTime; private Integer receivingTime;
/** /**
* 任务状态(-1:失败;0:待审核;1:待接受;2:进行中;3:待测试;5:暂停;7:接收超时;8:待部署;9:待归档;10:审核不通过) * 任务状态(-1:失败;0:待审核;1:待接受;2:进行中;3:待测试;5:暂停;7:接收超时;8:待部署;9:待归档;10:审核不通过)
*/ */
@ApiModelProperty(value = "任务状态(-1:失败;0:待审核;1:待接受;2:进行中;3:待测试;5:暂停;7:接收超时;8:待部署;9:待归档;10:审核不通过)") @Schema(description = "任务状态(-1:失败;0:待审核;1:待接受;2:进行中;3:待测试;5:暂停;7:接收超时;8:待部署;9:待归档;10:审核不通过)")
private Integer taskStatus; private Integer taskStatus;
} }
@ -165,70 +163,70 @@ public class TaskWorkOrderReceiveDealPauseVo {
* 暂停中 * 暂停中
*/ */
@Data @Data
@ApiModel("暂停中") @Schema(description = "暂停中")
public static class Pause { public static class Pause {
/** /**
* 工单id * 工单id
*/ */
@ApiModelProperty(value = "工单id") @Schema(description = "工单id")
private String id; private String id;
/** /**
* 机构/品牌 * 机构/品牌
*/ */
@ApiModelProperty(value = "机构/品牌") @Schema(description = "机构/品牌")
private String brandName; private String brandName;
/** /**
* 校区/店铺 * 校区/店铺
*/ */
@ApiModelProperty(value = "校区/店铺") @Schema(description = "校区/店铺")
private String storeName; private String storeName;
/** /**
* 问题描述 * 问题描述
*/ */
@ApiModelProperty(value = "问题描述") @Schema(description = "问题描述")
private String taskContent; private String taskContent;
/** /**
* 提交人 * 提交人
*/ */
@ApiModelProperty(value = "提交人") @Schema(description = "提交人")
private String recordStaffName; private String recordStaffName;
/** /**
* 提交时间 * 提交时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "提交时间") @Schema(description = "提交时间")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 接收人 * 接收人
*/ */
@ApiModelProperty(value = "接收人") @Schema(description = "接收人")
private String responsibleStaffName; private String responsibleStaffName;
/** /**
* 暂停员工 * 暂停员工
*/ */
@ApiModelProperty(value = "暂停员工") @Schema(description = "暂停员工")
private String pauseStaffName; private String pauseStaffName;
/** /**
* 暂停记录时间 * 暂停记录时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "暂停记录时间") @Schema(description = "暂停记录时间")
private LocalDateTime pauseRecordTime; private LocalDateTime pauseRecordTime;
/** /**
* 暂停到期时间 * 暂停到期时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "暂停到期时间") @Schema(description = "暂停到期时间")
private LocalDateTime pauseExpireTime; private LocalDateTime pauseExpireTime;
} }

45
Cpop-Oam/src/main/java/com/cpop/oam/business/vo/TaskWorkOrderStatPageVo.java
View File

@ -1,8 +1,7 @@
package com.cpop.oam.business.vo; package com.cpop.oam.business.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -15,130 +14,130 @@ import java.time.LocalDateTime;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "TaskWorkOrderStatPageVo对象", description = "工单统计") @Schema(description = "工单统计")
public class TaskWorkOrderStatPageVo { public class TaskWorkOrderStatPageVo {
/** /**
* id * id
*/ */
@ApiModelProperty(value = "id") @Schema(description = "id")
private String id; private String id;
/** /**
* 品牌 * 品牌
*/ */
@ApiModelProperty(value = "品牌") @Schema(description = "品牌")
private String brandName; private String brandName;
/** /**
* 校区店铺 * 校区店铺
*/ */
@ApiModelProperty(value = "校区店铺") @Schema(description = "校区店铺")
private String storeName; private String storeName;
/** /**
* 接收用时 * 接收用时
*/ */
@ApiModelProperty(value = "接收用时") @Schema(description = "接收用时")
private Integer receivingTime; private Integer receivingTime;
/** /**
* 任务内容 * 任务内容
*/ */
@ApiModelProperty("任务内容") @Schema(description ="任务内容")
private String taskContent; private String taskContent;
/** /**
* 暂停员工id * 暂停员工id
*/ */
@ApiModelProperty("暂停员工id") @Schema(description ="暂停员工id")
private String pauseStaffId; private String pauseStaffId;
/** /**
* 暂停员工 * 暂停员工
*/ */
@ApiModelProperty("暂停员工") @Schema(description ="暂停员工")
private String pauseStaffName; private String pauseStaffName;
/** /**
* 暂停记录时间 * 暂停记录时间
*/ */
@ApiModelProperty("暂停记录时间") @Schema(description ="暂停记录时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime pauseRecordTime; private LocalDateTime pauseRecordTime;
/** /**
* 暂停到期时间 * 暂停到期时间
*/ */
@ApiModelProperty("暂停到期时间") @Schema(description ="暂停到期时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime pauseExpireTime; private LocalDateTime pauseExpireTime;
/** /**
* 办结员工id * 办结员工id
*/ */
@ApiModelProperty("办结员工id") @Schema(description ="办结员工id")
private String finishStaffId; private String finishStaffId;
/** /**
* 办结员工 * 办结员工
*/ */
@ApiModelProperty("办结员工") @Schema(description ="办结员工")
private String finishStaffName; private String finishStaffName;
/** /**
* 办结时间 * 办结时间
*/ */
@ApiModelProperty("办结时间") @Schema(description ="办结时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime finishTime; private LocalDateTime finishTime;
/** /**
* 记录员工id * 记录员工id
*/ */
@ApiModelProperty("记录员工id") @Schema(description ="记录员工id")
private String recordStaffId; private String recordStaffId;
/** /**
* 记录员工 * 记录员工
*/ */
@ApiModelProperty("记录员工") @Schema(description ="记录员工")
private String recordStaffName; private String recordStaffName;
/** /**
* 主要负责员工id * 主要负责员工id
*/ */
@ApiModelProperty("主要负责员工id") @Schema(description ="主要负责员工id")
private String responsibleStaffId; private String responsibleStaffId;
/** /**
* 主要负责员工 * 主要负责员工
*/ */
@ApiModelProperty("主要负责员工") @Schema(description ="主要负责员工")
private String responsibleStaffName; private String responsibleStaffName;
/** /**
* 任务接收时间 * 任务接收时间
*/ */
@ApiModelProperty("任务接收时间") @Schema(description ="任务接收时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime taskReceiptTime; private LocalDateTime taskReceiptTime;
/** /**
* 绩点 * 绩点
*/ */
@ApiModelProperty("绩点") @Schema(description ="绩点")
private Integer gradePoint; private Integer gradePoint;
/** /**
* 备注 * 备注
*/ */
@ApiModelProperty("备注") @Schema(description ="备注")
private String remark; private String remark;
/** /**
* 任务状态 * 任务状态
*/ */
@ApiModelProperty("任务状态") @Schema(description ="任务状态")
private Integer taskStatus; private Integer taskStatus;
} }

20
Cpop-Oam/src/main/java/com/cpop/oam/business/vo/TechnologyToolPageVo.java
View File

@ -1,9 +1,7 @@
package com.cpop.oam.business.vo; package com.cpop.oam.business.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mybatisflex.annotation.Id; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -16,49 +14,49 @@ import java.time.LocalDateTime;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "TechnologyToolPageVo对象", description = "TechnologyToolPageVo对象") @Schema(description = "TechnologyToolPageVo对象")
public class TechnologyToolPageVo { public class TechnologyToolPageVo {
/** /**
* 主键 * 主键
*/ */
@ApiModelProperty(value = "主键") @Schema(description = "主键")
private String id; private String id;
/** /**
* 工具名 * 工具名
*/ */
@ApiModelProperty(value = "工具名") @Schema(description = "工具名")
private String toolName; private String toolName;
/** /**
* 工具地址 * 工具地址
*/ */
@ApiModelProperty(value = "工具地址") @Schema(description = "工具地址")
private String toolUrl; private String toolUrl;
/** /**
* 工具介绍 * 工具介绍
*/ */
@ApiModelProperty(value = "工具介绍") @Schema(description = "工具介绍")
private String toolDesc; private String toolDesc;
/** /**
* 工具类型(字典) * 工具类型(字典)
*/ */
@ApiModelProperty(value = "工具类型") @Schema(description = "工具类型")
private String toolType; private String toolType;
/** /**
* 创建人 * 创建人
*/ */
@ApiModelProperty(value = "创建人") @Schema(description = "创建人")
private String createUser; private String createUser;
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "创建时间") @Schema(description = "创建时间")
private LocalDateTime createTime; private LocalDateTime createTime;
} }

15
Cpop-Oam/src/main/java/com/cpop/oam/business/vo/WorkOrderDutyVo.java
View File

@ -2,8 +2,7 @@ package com.cpop.oam.business.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mybatisflex.annotation.RelationOneToOne; import com.mybatisflex.annotation.RelationOneToOne;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -17,39 +16,39 @@ import java.time.LocalDate;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "工单值班返回对象", description = "工单值班返回对象") @Schema(description = "工单值班返回对象")
public class WorkOrderDutyVo { public class WorkOrderDutyVo {
/** /**
* 服务员工id * 服务员工id
*/ */
@ApiModelProperty("服务员工id") @Schema(description ="服务员工id")
private String serviceStaffId; private String serviceStaffId;
/** /**
* 服务员工名称 * 服务员工名称
*/ */
@RelationOneToOne(selfField = "serviceStaffId", targetField = "id", targetTable = "cp_oam_staff", valueField = "name") @RelationOneToOne(selfField = "serviceStaffId", targetField = "id", targetTable = "cp_oam_staff", valueField = "name")
@ApiModelProperty("服务员工名称") @Schema(description ="服务员工名称")
private String serviceStaffName; private String serviceStaffName;
/** /**
* 技术员工id * 技术员工id
*/ */
@ApiModelProperty("技术员工id") @Schema(description ="技术员工id")
private String technologyStaffId; private String technologyStaffId;
/** /**
* 技术员工名称 * 技术员工名称
*/ */
@RelationOneToOne(selfField = "technologyStaffId", targetField = "id", targetTable = "cp_oam_staff", valueField = "name") @RelationOneToOne(selfField = "technologyStaffId", targetField = "id", targetTable = "cp_oam_staff", valueField = "name")
@ApiModelProperty("技术员工名称") @Schema(description ="技术员工名称")
private String technologyStaffName; private String technologyStaffName;
/** /**
* 值班日期 * 值班日期
*/ */
@ApiModelProperty("值班日期") @Schema(description ="值班日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate dutyDate; private LocalDate dutyDate;

6
Cpop-Oam/src/main/java/com/cpop/oam/business/vo/WxCpLoginVo.java
View File

@ -1,6 +1,6 @@
package com.cpop.oam.business.vo; package com.cpop.oam.business.vo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
@ -18,12 +18,12 @@ public class WxCpLoginVo implements Serializable {
/** /**
* 用户名 * 用户名
*/ */
@ApiModelProperty("用户名") @Schema(description = "用户名")
private String userName; private String userName;
/** /**
* rsa密码 * rsa密码
*/ */
@ApiModelProperty("rsa密码") @Schema(description = "rsa密码")
private String rsaPassword; private String rsaPassword;
} }

20
Cpop-Oam/src/main/java/com/cpop/oam/business/vo/WxOpenMiniVo.java
View File

@ -1,14 +1,13 @@
package com.cpop.oam.business.vo; package com.cpop.oam.business.vo;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.cpop.common.utils.DateUtils; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
/** /**
* @author DB * @author DB
@ -17,36 +16,35 @@ import java.util.Date;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "OpenPlatformAuthorizerListVo拉取已授权的帐号信息") @Schema(description = "OpenPlatformAuthorizerListVo拉取已授权的帐号信息")
public class WxOpenMiniVo implements Serializable { public class WxOpenMiniVo implements Serializable {
/** /**
* 已授权帐号的 appid * 已授权帐号的 appid
*/ */
@JSONField(name = "authorizer_appid") @JSONField(name = "authorizer_appid")
@ApiModelProperty("已授权帐号的 appid") @Schema(description ="已授权帐号的 appid")
private String authorizerAppid; private String authorizerAppid;
/** /**
* 刷新令牌authorizer_refresh_token * 刷新令牌authorizer_refresh_token
*/ */
@JSONField(name = "refresh_token") @JSONField(name = "refresh_token")
@ApiModelProperty("刷新令牌authorizer_refresh_token") @Schema(description ="刷新令牌authorizer_refresh_token")
private String refreshToken; private String refreshToken;
/** /**
* 授权的时间 * 授权的时间
*/ */
@JSONField(name = "auth_time") @JSONField(name = "auth_time")
@ApiModelProperty("授权的时间") @Schema(description ="授权的时间")
private String authTime; private String authTime;
public void setAuthTime(Integer authTime) { public void setAuthTime(Integer authTime) {
Date date = new Date(authTime * 1000L); this.authTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
this.authTime = DateUtils.format(date, "yyyy-MM-dd HH:mm:ss");
} }
/** /**
* 小程序名称 * 小程序名称
*/ */
@ApiModelProperty("小程序名称") @Schema(description ="小程序名称")
private String nickName; private String nickName;
} }

5
Cpop-Oam/src/main/java/com/cpop/oam/framework/config/InitConfig.java
View File

@ -1,14 +1,13 @@
package com.cpop.oam.framework.config; package com.cpop.oam.framework.config;
import com.cpop.system.framework.enums.InitRoleEnum;
import com.cpop.core.utils.SpringUtils; import com.cpop.core.utils.SpringUtils;
import com.cpop.system.business.entity.Role; import com.cpop.system.business.entity.Role;
import com.cpop.system.business.service.RoleService; import com.cpop.system.business.service.RoleService;
import com.cpop.system.framework.enums.InitRoleEnum;
import jakarta.annotation.PostConstruct;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
/** /**
* 初始化配置 * 初始化配置
* @author DB * @author DB

2
Cpop-Oam/src/main/java/com/cpop/oam/framework/config/wxCp/WxCpConfiguration.java
View File

@ -2,6 +2,7 @@ package com.cpop.oam.framework.config.wxCp;
import com.cpop.oam.framework.handler.wxCp.*; import com.cpop.oam.framework.handler.wxCp.*;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import jakarta.annotation.PostConstruct;
import lombok.val; import lombok.val;
import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.api.WxConsts;
import me.chanjar.weixin.cp.api.WxCpService; import me.chanjar.weixin.cp.api.WxCpService;
@ -13,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import javax.annotation.PostConstruct;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;

2
Cpop-Oam/src/main/java/com/cpop/oam/framework/config/wxCp/WxCpProperties.java
View File

@ -1,6 +1,6 @@
package com.cpop.oam.framework.config.wxCp; package com.cpop.oam.framework.config.wxCp;
import com.cpop.common.utils.JsonUtils; import com.cpop.core.utils.JsonUtils;
import lombok.Data; import lombok.Data;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

132
Cpop-Oam/src/main/java/com/cpop/oam/framework/config/wxMa/WxMaConfiguration.java
View File

@ -1,132 +0,0 @@
package com.cpop.oam.framework.config.wxMa;
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
import cn.binarywang.wx.miniapp.bean.WxMaKefuMessage;
import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
import cn.binarywang.wx.miniapp.message.WxMaMessageHandler;
import cn.binarywang.wx.miniapp.message.WxMaMessageRouter;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
import me.chanjar.weixin.common.error.WxErrorException;
import me.chanjar.weixin.common.error.WxRuntimeException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.io.File;
import java.util.List;
import java.util.stream.Collectors;
/**
* @author <a href="https://github.com/binarywang">Binary Wang</a>
*/
@Slf4j
@Configuration
@EnableConfigurationProperties(WxMaProperties.class)
public class WxMaConfiguration {
private final WxMaProperties properties;
@Autowired
public WxMaConfiguration(WxMaProperties properties) {
this.properties = properties;
}
@Bean
public WxMaService wxMaService() {
List<WxMaProperties.Config> configs = this.properties.getConfigs();
if (configs == null) {
throw new WxRuntimeException("小程序相关信息配置错误");
}
WxMaService maService = new WxMaServiceImpl();
maService.setMultiConfigs(
configs.stream()
.map(a -> {
WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
//WxMaDefaultConfigImpl config = new WxMaRedisConfigImpl(new JedisPool());
// 使用上面的配置时，需要同时引入jedis-lock的依赖，否则会报类无法找到的异常
config.setAppid(a.getAppid());
config.setSecret(a.getSecret());
config.setToken(a.getToken());
config.setAesKey(a.getAesKey());
config.setMsgDataFormat(a.getMsgDataFormat());
return config;
}).collect(Collectors.toMap(WxMaDefaultConfigImpl::getAppid, a -> a, (o, n) -> o)));
return maService;
}
@Bean
public WxMaMessageRouter wxMaMessageRouter(WxMaService wxMaService) {
final WxMaMessageRouter router = new WxMaMessageRouter(wxMaService);
router
.rule().handler(logHandler).next()
.rule().async(false).content("订阅消息").handler(subscribeMsgHandler).end()
.rule().async(false).content("文本").handler(textHandler).end()
.rule().async(false).content("图片").handler(picHandler).end()
.rule().async(false).content("二维码").handler(qrcodeHandler).end();
return router;
}
private final WxMaMessageHandler subscribeMsgHandler = (wxMessage, context, service, sessionManager) -> {
service.getMsgService().sendSubscribeMsg(WxMaSubscribeMessage.builder()
.templateId("此处更换为自己的模板id")
.data(Lists.newArrayList(
new WxMaSubscribeMessage.MsgData("keyword1", "339208499")))
.toUser(wxMessage.getFromUser())
.build());
return null;
};
private final WxMaMessageHandler logHandler = (wxMessage, context, service, sessionManager) -> {
log.info("收到消息：" + wxMessage.toString());
service.getMsgService().sendKefuMsg(WxMaKefuMessage.newTextBuilder().content("收到信息为：" + wxMessage.toJson())
.toUser(wxMessage.getFromUser()).build());
return null;
};
private final WxMaMessageHandler textHandler = (wxMessage, context, service, sessionManager) -> {
service.getMsgService().sendKefuMsg(WxMaKefuMessage.newTextBuilder().content("回复文本消息")
.toUser(wxMessage.getFromUser()).build());
return null;
};
private final WxMaMessageHandler picHandler = (wxMessage, context, service, sessionManager) -> {
try {
WxMediaUploadResult uploadResult = service.getMediaService()
.uploadMedia("image", "png",
ClassLoader.getSystemResourceAsStream("tmp.png"));
service.getMsgService().sendKefuMsg(
WxMaKefuMessage
.newImageBuilder()
.mediaId(uploadResult.getMediaId())
.toUser(wxMessage.getFromUser())
.build());
} catch (WxErrorException e) {
e.printStackTrace();
}
return null;
};
private final WxMaMessageHandler qrcodeHandler = (wxMessage, context, service, sessionManager) -> {
try {
final File file = service.getQrcodeService().createQrcode("123", 430);
WxMediaUploadResult uploadResult = service.getMediaService().uploadMedia("image", file);
service.getMsgService().sendKefuMsg(
WxMaKefuMessage
.newImageBuilder()
.mediaId(uploadResult.getMediaId())
.toUser(wxMessage.getFromUser())
.build());
} catch (WxErrorException e) {
e.printStackTrace();
}
return null;
};
}

46
Cpop-Oam/src/main/java/com/cpop/oam/framework/config/wxMa/WxMaProperties.java
View File

@ -1,46 +0,0 @@
package com.cpop.oam.framework.config.wxMa;
import java.util.List;
import org.springframework.boot.context.properties.ConfigurationProperties;
import lombok.Data;
/**
* @author <a href="https://github.com/binarywang">Binary Wang</a>
*/
@Data
@ConfigurationProperties(prefix = "wx.miniapp")
public class WxMaProperties {
private List<Config> configs;
@Data
public static class Config {
/**
* 设置微信小程序的appid
*/
private String appid;
/**
* 设置微信小程序的Secret
*/
private String secret;
/**
* 设置微信小程序消息服务器配置的token
*/
private String token;
/**
* 设置微信小程序消息服务器配置的EncodingAESKey
*/
private String aesKey;
/**
* 消息格式，XML或者JSON
*/
private String msgDataFormat;
}
}

47
Cpop-Oam/src/main/java/com/cpop/oam/framework/config/wxOpen/WxOpenProperties.java → Cpop-Oam/src/main/java/com/cpop/oam/framework/config/wxOpen/WechatOpenProperties.java
View File

@ -1,19 +1,16 @@
package com.cpop.oam.framework.config.wxOpen; package com.cpop.oam.framework.config.wxOpen;
import lombok.Getter;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
/** /**
* @author DB * @author <a href="https://github.com/007gzs">007</a>
* @createTime 2023/10/10 11:13
* @description
*/ */
@Getter
@ConfigurationProperties(prefix = "wx.open") @ConfigurationProperties(prefix = "wx.open")
public class WxOpenProperties { public class WechatOpenProperties {
private String openAppid;
/** /**
* 设置微信三方平台的appid * 设置微信三方平台的appid
*/ */
@ -35,58 +32,30 @@ public class WxOpenProperties {
private String componentAesKey; private String componentAesKey;
/** /**
* 获取跳转页面URL * 授权链接
*/ */
private String redirectUri; private String authorizedLink;
public String getOpenAppid() { public void setAuthorizedLink(String authorizedLink) {
return openAppid; this.authorizedLink = authorizedLink;
}
public void setOpenAppid(String openAppid) {
this.openAppid = openAppid;
}
public String getComponentAppId() {
return componentAppId;
} }
public void setComponentAppId(String componentAppId) { public void setComponentAppId(String componentAppId) {
this.componentAppId = componentAppId; this.componentAppId = componentAppId;
} }
public String getComponentSecret() {
return componentSecret;
}
public void setComponentSecret(String componentSecret) { public void setComponentSecret(String componentSecret) {
this.componentSecret = componentSecret; this.componentSecret = componentSecret;
} }
public String getComponentToken() {
return componentToken;
}
public void setComponentToken(String componentToken) { public void setComponentToken(String componentToken) {
this.componentToken = componentToken; this.componentToken = componentToken;
} }
public String getComponentAesKey() {
return componentAesKey;
}
public void setComponentAesKey(String componentAesKey) { public void setComponentAesKey(String componentAesKey) {
this.componentAesKey = componentAesKey; this.componentAesKey = componentAesKey;
} }
public String getRedirectUri() {
return redirectUri;
}
public void setRedirectUri(String redirectUri) {
this.redirectUri = redirectUri;
}
@Override @Override
public String toString() { public String toString() {
return ToStringBuilder.reflectionToString(this, return ToStringBuilder.reflectionToString(this,

67
Cpop-Oam/src/main/java/com/cpop/oam/framework/config/wxOpen/WxOpenRedisProperties.java Normal file
View File

@ -0,0 +1,67 @@
package com.cpop.oam.framework.config.wxOpen;
import com.cpop.core.utils.StringUtils;
import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.serializer.StringRedisSerializer;
/**
* 微信开放平台统一配置文件
* @author DB
* @version 1.0.0
* @since 2024-03-26 18:14
*/
@Data
@Configuration
@ConfigurationProperties(prefix = "wx.open.redis")
public class WxOpenRedisProperties {
/**
* 地址
*/
private String host;
/**
* 端口
*/
private Integer port;
/**
* 密码
*/
private String password;
/**
* 数据库
*/
private Integer database;
@Autowired
private RedisProperties redisProperties;
@Bean(name = "wxOpenRedisConnectionFactory")
public RedisConnectionFactory wxOpenRedisConnectionFactory() {
RedisStandaloneConfiguration configuration = new RedisStandaloneConfiguration(host, port);
configuration.setDatabase(database);
if (StringUtils.isNotBlank(password)) {
configuration.setPassword(password);
}
return new JedisConnectionFactory(configuration);
}
@Bean(name = "wxOpenRedisTemplate")
public StringRedisTemplate wxOpenRedisTemplate(@Qualifier("wxOpenRedisConnectionFactory") RedisConnectionFactory redisConnectionFactory) {
StringRedisTemplate redisTemplate = new StringRedisTemplate();
redisTemplate.setConnectionFactory(redisConnectionFactory);
redisTemplate.setKeySerializer(new StringRedisSerializer());
redisTemplate.setValueSerializer(new StringRedisSerializer());
return redisTemplate;
}
}

2
Cpop-Oam/src/main/java/com/cpop/oam/framework/enums/OamConfigEnum.java
View File

@ -1,6 +1,6 @@
package com.cpop.oam.framework.enums; package com.cpop.oam.framework.enums;
import com.cpop.common.utils.StringUtils; import com.cpop.core.utils.StringUtils;
/** /**
* 系统配置枚举 * 系统配置枚举

2
Cpop-Oam/src/main/java/com/cpop/oam/framework/handler/wxCp/ContactChangeHandler.java
View File

@ -1,6 +1,6 @@
package com.cpop.oam.framework.handler.wxCp; package com.cpop.oam.framework.handler.wxCp;
import com.cpop.common.utils.JsonUtils; import com.cpop.core.utils.JsonUtils;
import com.cpop.oam.business.service.StaffService; import com.cpop.oam.business.service.StaffService;
import com.cpop.oam.framework.builder.wxCp.TextBuilder; import com.cpop.oam.framework.builder.wxCp.TextBuilder;
import com.cpop.oam.framework.constant.WxCpConstant; import com.cpop.oam.framework.constant.WxCpConstant;

2
Cpop-Oam/src/main/java/com/cpop/oam/framework/handler/wxCp/LogHandler.java
View File

@ -1,6 +1,6 @@
package com.cpop.oam.framework.handler.wxCp; package com.cpop.oam.framework.handler.wxCp;
import com.cpop.common.utils.JsonUtils; import com.cpop.core.utils.JsonUtils;
import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.common.session.WxSessionManager;
import me.chanjar.weixin.cp.api.WxCpService; import me.chanjar.weixin.cp.api.WxCpService;
import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage; import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage;

2
Cpop-Oam/src/main/java/com/cpop/oam/framework/handler/wxCp/MsgHandler.java
View File

@ -1,6 +1,6 @@
package com.cpop.oam.framework.handler.wxCp; package com.cpop.oam.framework.handler.wxCp;
import com.cpop.common.utils.JsonUtils; import com.cpop.core.utils.JsonUtils;
import com.cpop.oam.framework.builder.wxCp.TextBuilder; import com.cpop.oam.framework.builder.wxCp.TextBuilder;
import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.api.WxConsts;
import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.common.session.WxSessionManager;

9
Cpop-Oam/src/main/java/com/cpop/oam/framework/handler/wxOpen/WxOpenService.java
View File

@ -1,6 +1,7 @@
package com.cpop.oam.framework.handler.wxOpen; package com.cpop.oam.framework.handler.wxOpen;
import com.cpop.oam.framework.config.wxOpen.WxOpenProperties; import com.cpop.oam.framework.config.wxOpen.WechatOpenProperties;
import jakarta.annotation.PostConstruct;
import lombok.Getter; import lombok.Getter;
import me.chanjar.weixin.open.api.impl.WxOpenInRedisTemplateConfigStorage; import me.chanjar.weixin.open.api.impl.WxOpenInRedisTemplateConfigStorage;
import me.chanjar.weixin.open.api.impl.WxOpenMessageRouter; import me.chanjar.weixin.open.api.impl.WxOpenMessageRouter;
@ -12,21 +13,19 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
/** /**
* @author DB * @author DB
* @createTime 2023/10/27 9:30 * @createTime 2023/10/27 9:30
* @description * @description
*/ */
@Service @Service
@EnableConfigurationProperties({WxOpenProperties.class}) @EnableConfigurationProperties({WechatOpenProperties.class})
public class WxOpenService extends WxOpenServiceImpl { public class WxOpenService extends WxOpenServiceImpl {
private final Logger logger = LoggerFactory.getLogger(getClass()); private final Logger logger = LoggerFactory.getLogger(getClass());
@Autowired @Autowired
private WxOpenProperties wxOpenProperties; private WechatOpenProperties wxOpenProperties;
@Getter @Getter
private WxOpenMessageRouter wxOpenMessageRouter; private WxOpenMessageRouter wxOpenMessageRouter;

17
Cpop-Oam/src/main/java/com/cpop/oam/framework/strategy/cloud/CloudSyncBrandOrStoreCallbackStrategy.java
View File

@ -1,20 +1,8 @@
package com.cpop.oam.framework.strategy.cloud; package com.cpop.oam.framework.strategy.cloud;
import com.cpop.common.utils.bean.BeanUtils;
import com.cpop.core.utils.SpringUtils;
import com.cpop.oam.business.bo.CloudUnionCallbackBo; import com.cpop.oam.business.bo.CloudUnionCallbackBo;
import com.cpop.system.business.entity.Brand;
import com.cpop.system.business.entity.Store;
import com.cpop.system.business.service.BrandService;
import com.cpop.system.business.service.StoreService;
import com.mybatisflex.core.row.Db;
import com.mybatisflex.core.row.DbChain;
import com.mybatisflex.core.row.Row;
import com.mybatisflex.core.row.RowKey;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
/** /**
* *
* @author DB * @author DB
@ -32,7 +20,8 @@ public class CloudSyncBrandOrStoreCallbackStrategy implements CloudCallbackStrat
*/ */
@Override @Override
public void callback(CloudUnionCallbackBo callback) { public void callback(CloudUnionCallbackBo callback) {
SyncBrandAndStoreBo.BrandInfo brandInfo = callback.getSyncBrandAndStore().getBrandInfo(); //TODO：回调策略
/*SyncBrandAndStoreBo.BrandInfo brandInfo = callback.getSyncBrandAndStore().getBrandInfo();
//查询品牌 //查询品牌
Row brandExtend = DbChain.table("cp_j_brand_extend").where("brand_cloud_id = ?", brandInfo.getBrandCloudId()).one(); Row brandExtend = DbChain.table("cp_j_brand_extend").where("brand_cloud_id = ?", brandInfo.getBrandCloudId()).one();
Brand brand; Brand brand;
@ -73,6 +62,6 @@ public class CloudSyncBrandOrStoreCallbackStrategy implements CloudCallbackStrat
//营业执照 //营业执照
StoreLicense storeLicense = BeanUtils.mapToClass(storeInfo, StoreLicense.class); StoreLicense storeLicense = BeanUtils.mapToClass(storeInfo, StoreLicense.class);
storeLicense.setStoreId(store.getId()); storeLicense.setStoreId(store.getId());
SpringUtils.getBean(StoreLicenseService.class).save(storeLicense); SpringUtils.getBean(StoreLicenseService.class).save(storeLicense);*/
} }
} }

21
Cpop-Oam/src/main/java/com/cpop/oam/framework/tasks/OamScheduledTasks.java
View File

@ -1,16 +1,13 @@
package com.cpop.oam.framework.tasks; package com.cpop.oam.framework.tasks;
import com.cpop.api.cloudDb.core.dto.CloudStoreActiveDto;
import com.cpop.api.cloudDb.handler.CloudStoreHandler;
import com.cpop.api.tencent.wxWork.handler.WebHookSendHandler; import com.cpop.api.tencent.wxWork.handler.WebHookSendHandler;
import com.cpop.common.utils.StringUtils;
import com.cpop.common.utils.bean.BeanUtils;
import com.cpop.core.base.exception.ServiceException; import com.cpop.core.base.exception.ServiceException;
import com.cpop.core.base.table.SysConfig; import com.cpop.core.base.table.Config;
import com.cpop.core.service.ConfigService;
import com.cpop.core.service.RedisService; import com.cpop.core.service.RedisService;
import com.cpop.core.utils.SpringUtils; import com.cpop.core.utils.SpringUtils;
import com.cpop.jambox.business.entity.StoreActive; import com.cpop.core.utils.StringUtils;
import com.cpop.jambox.business.service.StoreActiveService; import com.cpop.core.utils.bean.BeanUtils;
import com.cpop.oam.business.entity.Clue; import com.cpop.oam.business.entity.Clue;
import com.cpop.oam.business.entity.ClueRecord; import com.cpop.oam.business.entity.ClueRecord;
import com.cpop.oam.business.entity.DataImport; import com.cpop.oam.business.entity.DataImport;
@ -35,7 +32,6 @@ import org.springframework.transaction.annotation.Transactional;
import java.io.IOException; import java.io.IOException;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -115,7 +111,7 @@ public class OamScheduledTasks {
public void checkClue() { public void checkClue() {
log.info("==============开始检查线索数据==========="); log.info("==============开始检查线索数据===========");
RedisService redisService = SpringUtils.getBean(RedisService.class); RedisService redisService = SpringUtils.getBean(RedisService.class);
CoreService coreService = SpringUtils.getBean(CoreService.class); ConfigService configService = SpringUtils.getBean(ConfigService.class);
CommonService commonService = SpringUtils.getBean(CommonService.class); CommonService commonService = SpringUtils.getBean(CommonService.class);
Map<String, String> configMap = new HashMap<>(8); Map<String, String> configMap = new HashMap<>(8);
Arrays.asList(OamConfigKey.SIGN_GOAL).forEach(item -> { Arrays.asList(OamConfigKey.SIGN_GOAL).forEach(item -> {
@ -126,7 +122,7 @@ public class OamScheduledTasks {
configMap.put(sysConfigEnum.getField(), cacheInfo); configMap.put(sysConfigEnum.getField(), cacheInfo);
} else { } else {
// 查询系统 // 查询系统
SysConfig sysConfig = coreService.selectConfigByKey(item); Config sysConfig = configService.getById(item);
if (null != sysConfig) { if (null != sysConfig) {
// 获取枚举 // 获取枚举
OamConfigEnum sysConfigEnum = OamConfigEnum.matchKey(item); OamConfigEnum sysConfigEnum = OamConfigEnum.matchKey(item);
@ -268,7 +264,8 @@ public class OamScheduledTasks {
* @author DB * @author DB
* @since 2024/4/12 * @since 2024/4/12
*/ */
@Scheduled(cron = "0 40 1 * * *") //TODO：每天晚上1点40或前天校区活跃数
/*@Scheduled(cron = "0 40 1 * * *")
public void getStoreActivityData(){ public void getStoreActivityData(){
LocalDate date = LocalDate.now().minusDays(1); LocalDate date = LocalDate.now().minusDays(1);
List<CloudStoreActiveDto> storeActiveData = SpringUtils.getBean(CloudStoreHandler.class).getStoreActiveData(date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); List<CloudStoreActiveDto> storeActiveData = SpringUtils.getBean(CloudStoreHandler.class).getStoreActiveData(date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
@ -280,5 +277,5 @@ public class OamScheduledTasks {
SpringUtils.getBean(StoreActiveService.class).saveBatch(storeActives); SpringUtils.getBean(StoreActiveService.class).saveBatch(storeActives);
} }
} }*/
} }

5
Cpop-Oam/src/main/java/com/cpop/oam/framework/tasks/WorkOrderAcceptOverTimeTask.java
View File

@ -1,23 +1,18 @@
package com.cpop.oam.framework.tasks; package com.cpop.oam.framework.tasks;
import com.cpop.common.utils.http.HttpHelper;
import com.cpop.core.utils.SpringUtils; import com.cpop.core.utils.SpringUtils;
import com.cpop.oam.business.entity.Task; import com.cpop.oam.business.entity.Task;
import com.cpop.oam.business.entity.TaskWorkOrder; import com.cpop.oam.business.entity.TaskWorkOrder;
import com.cpop.oam.business.service.TaskStaffGroupService; import com.cpop.oam.business.service.TaskStaffGroupService;
import com.cpop.oam.business.service.TaskWorkOrderService; import com.cpop.oam.business.service.TaskWorkOrderService;
import lombok.extern.slf4j.Slf4j;
import org.quartz.Job; import org.quartz.Job;
import org.quartz.JobDataMap; import org.quartz.JobDataMap;
import org.quartz.JobExecutionContext; import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import static com.cpop.oam.business.entity.table.TaskStaffGroupTableDef.TASK_STAFF_GROUP; import static com.cpop.oam.business.entity.table.TaskStaffGroupTableDef.TASK_STAFF_GROUP;
import static com.cpop.oam.business.entity.table.TaskTableDef.TASK; import static com.cpop.oam.business.entity.table.TaskTableDef.TASK;
import com.cpop.oam.business.service.TaskService; import com.cpop.oam.business.service.TaskService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* @author DB * @author DB

1
Cpop-Oam/src/main/resources/application-oam.yml
View File

@ -1 +0,0 @@

35
Cpop-Pay/src/main/resources/application-pay.yml
View File

@ -1,20 +1,29 @@
wx: wx:
#微信支付 #微信支付
pay: pay:
#微信公众号或者小程序等的appid backstage-app-id: wx1eb0e5fb7dac3c05
app-id: wx20853d18c455e874 # 后台普通支付商户号
#微信支付商户号 backstage-mch-id: 1618436087
mch-id: 1618884922 # 后台商户密钥
#微信支付商户密钥 backstage-mch-key: JamBox20220329174000000000000002
mch-key: JamBox20230919174000000000000002 # 后台证书路径
api-v3-key: JamBox20230919174000000000000002 backstage-key-path: https://6265-beibeike-qy-b33k4-1302318474.tcb.qcloud.la/apiclient_cert.p12?sign=151cbcc241ad40403ad7b4731127554a&t=1661146932
#服务id # 服务商appid
service-id: 00003053000000169450961228104460
#分账服务商账号
sharing-account: 1618884922
sharing-account-name: 果酱盒子
#服务商appid
service-app-id: wx1eb0e5fb7dac3c05 service-app-id: wx1eb0e5fb7dac3c05
# 服务商商户号
service-mch-id: 1618884922
# 支付密钥文件地址
service-private-key-path: https://dataresource-1302318474.cos.accelerate.myqcloud.com/b7742a56babb4e08805da3eaac46aaf5.pem
# 支付密钥文件地址
service-private-cert-path: https://dataresource-1302318474.cos.accelerate.myqcloud.com/1a40dd000db44a9fb98f25fefaf4e519.pem
# 服务商apiV3密钥
service-api-v3-key: JamBox20230919174000000000000002
# 服务id
service-id: 00003053000000169450961228104460
# 分账服务商账号
sharing-account: 1618884922
# 分账账号名
sharing-account-name: 果酱盒子
logging: logging:
level: level:
com.github.binarywang.wxpay: debug com.github.binarywang.wxpay: debug

121
Cpop-System/src/main/java/com/cpop/system/framework/config/SaTokenConfigure.java Normal file
View File

@ -0,0 +1,121 @@
package com.cpop.system.framework.config;
import cn.dev33.satoken.exception.SaTokenException;
import cn.dev33.satoken.interceptor.SaInterceptor;
import cn.dev33.satoken.jwt.StpLogicJwtForSimple;
import cn.dev33.satoken.router.SaRouter;
import cn.dev33.satoken.stp.StpLogic;
import cn.dev33.satoken.stp.StpUtil;
import com.cpop.core.base.enums.UserType;
import com.cpop.core.constant.Constants;
import com.cpop.core.constant.HttpStatus;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.CorsConfigurationSource;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import java.time.LocalDate;
import java.util.Arrays;
import java.util.Collections;
/**
* @author DB
* @Description: Security配置中心
* @since 2023-08-05 8:01
*/
@Configuration
@RequiredArgsConstructor
public class SaTokenConfigure implements WebMvcConfigurer {
/**
* 路径白名单
*/
@Value("${cpop.jwt.white-list}")
private String whiteList;
/**
* 上传路径url
*/
@Value("${cpop.profile}")
private String profile;
/**
* 注册 Sa-Token 拦截器，打开注解式鉴权功能
*
* @param registry 拦截器注册
* @author DB
* @since 2024/3/20
*/
@Override
public void addInterceptors(InterceptorRegistry registry) {
// 注册 Sa-Token 拦截器，打开注解式鉴权功能
registry.addInterceptor(new SaInterceptor(handle -> {
SaRouter.match("/**")
//基础接口不做处理
.notMatch("/backstage/getUserInfo", "/backstage/getPermCode", "/backstage/getMenuList","/backstage/index/getExtendList","/backstage/logout","/backstage/index/changeDistrict/*","/backstage/index/changeBackstageSystem")
.check(r -> {
StpUtil.checkLogin();
//检查登录账号是否过期
if (StpUtil.getSession().get("userType") == UserType.OAM_USER) {
LocalDate expireDate = (LocalDate) StpUtil.getSession().get("expireDate");
if (LocalDate.now().isAfter(expireDate)) {
throw new SaTokenException(HttpStatus.STORE_EXPIRE, "校区已过期");
}
}
});
SaRouter.match("/backstage/getUserInfo", "/backstage/getPermCode", "/backstage/getMenuList","/backstage/index/getExtendList","/backstage/logout","/backstage/index/changeDistrict/*","/backstage/index/changeBackstageSystem")
.check(r -> {
StpUtil.checkLogin();
});
}))
.addPathPatterns("/**")
.excludePathPatterns(Arrays.asList(whiteList.split(",")));
}
/**
* Sa-Token 整合 jwt (Simple 简单模式)
* @author DB
* @since 2024/3/20
* @return StpLogic
*/
@Bean
public StpLogic getStpLogicJwt() {
return new StpLogicJwtForSimple();
}
/**
* 配置跨源访问(CORS)
*/
@Bean
public CorsConfigurationSource corsConfigurationSource() {
CorsConfiguration configuration = new CorsConfiguration();
configuration.setAllowedOrigins(Collections.singletonList("*"));
configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE"));
configuration.setAllowedHeaders(Arrays.asList("Authorization", "Content-Type"));
configuration.applyPermitDefaultValues();
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
source.registerCorsConfiguration("/**", configuration);
return source;
}
/**
* 资源映射
*
* @param registry 注册
* @author DB
* @since 2023/5/27 13:57
*/
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
//本地文件上传路径
registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**")
.addResourceLocations("file:" + profile + "/");
}
}

6
pom.xml
View File

@ -203,12 +203,6 @@
<artifactId>weixin-java-cp</artifactId> <artifactId>weixin-java-cp</artifactId>
<version>${wxJava.version}</version> <version>${wxJava.version}</version>
</dependency> </dependency>
<!--微信小程序-->
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-miniapp</artifactId>
<version>${wxJava.version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>