xiaozhan
/
tobacco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改接口

Browse Source
master
username 9 months ago
parent 2abaf9a817
commit 452255420d
13 changed files with 153 additions and 37 deletions
Show Stats Download Patch File Download Diff File

20
bs-admin/src/main/java/com/bs/df/controller/DfBizClueController.java
Unescape View File

@ -11,6 +11,7 @@ import com.bs.common.core.domain.entity.SysUser;
import com.bs.common.utils.SecurityUtils;
import com.bs.common.utils.ServletUtils;
import com.bs.df.mapper.DfBizClueMapper;
import com.bs.system.service.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@ -49,7 +50,8 @@ public class DfBizClueController extends BaseController {
private IDfBizClueService dfBizClueService;
@Resource
private DfBizClueMapper dfBizClueMapper;
@Resource
private ISysUserService userService;
/**
* 分页查询业务线索列表
*/
@ -59,6 +61,14 @@ public class DfBizClueController extends BaseController {
startPage();
LambdaQueryWrapper<DfBizClue> queryWrapper = new LambdaQueryWrapper();
condition(queryWrapper,dfBizClue);
queryWrapper.orderByDesc(DfBizClue::getBrowseTime);
boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
if (!admin) {
SysUser byId = userService.getById(SecurityUtils.getUserId());
if ("jj".equals(byId.getUserType())) {
queryWrapper.eq(DfBizClue::getUserId,SecurityUtils.getUserId());
}
}
List<DfBizClue> list = dfBizClueService.list(queryWrapper);
return getDataTable(list);
}
@ -76,6 +86,12 @@ public class DfBizClueController extends BaseController {
Integer pageSize = ServletUtils.getParameterToInt(Constants.PAGE_SIZE);
LambdaQueryWrapper<DfBizClue> queryWrapper = new LambdaQueryWrapper();
// condition(queryWrapper,dfBizClue);
queryWrapper.eq(DfBizClue::getDataType,dfBizClue.getDataType());
queryWrapper.eq(DfBizClue::getShareUser,SecurityUtils.getUserId());
//传入hasOrder参数为1时，查询出存在orderId的数据
if (Validator.isNotEmpty(dfBizClue.getHasOrder())) {
queryWrapper.isNotNull(DfBizClue::getOrderId);
}
List<DfBizClue> list = dfBizClueService.list(queryWrapper);
Map<String, Integer> visitsNum = new HashMap<>();
for (DfBizClue clue : list) {
@ -202,7 +218,7 @@ public class DfBizClueController extends BaseController {
public AjaxResult addVisitor(DfBizClue dfBizClue) {
Date date = new Date();
dfBizClue.setCreateTimeVo(date);
dfBizClue.setTenantId(SecurityUtils.getTenantId());
// dfBizClue.setTenantId(SecurityUtils.getTenantId());
return toAjax(dfBizClueMapper.insertClue(dfBizClue));
}

4
bs-admin/src/main/java/com/bs/df/controller/DfBrokerController.java
Unescape View File

@ -111,6 +111,10 @@ public class DfBrokerController extends BaseController {
public AjaxResult list(DfBroker dfBroker) {
LambdaQueryWrapper<DfBroker> queryWrapper = new LambdaQueryWrapper();
condition(queryWrapper,dfBroker);
if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
List<Long> longs = dfBrokerService.filterByUser();
queryWrapper.in(DfBroker::getId, longs);
}
List<DfBroker> list = dfBrokerService.list(queryWrapper);
return success(list);
}

43
bs-admin/src/main/java/com/bs/df/controller/DfOrderController.java
Unescape View File

@ -11,7 +11,9 @@ import com.bs.common.core.domain.entity.SysUser;
import com.bs.common.utils.SecurityUtils;
import com.bs.df.domain.DfBizClue;
import com.bs.df.domain.DfBroker;
import com.bs.df.mapper.DfBizClueMapper;
import com.bs.df.mapper.DfOrderMapper;
import com.bs.df.service.IDfBizClueService;
import com.bs.df.service.IDfBrokerService;
import com.bs.system.service.ISysUserService;
import io.swagger.annotations.Api;
@ -57,6 +59,10 @@ public class DfOrderController extends BaseController {
private ISysUserService userService;
@Resource
private DfOrderMapper dfOrderMapper;
@Resource
private IDfBizClueService dfBizClueService;
@Resource
private DfBizClueMapper dfBizClueMapper;
/**
* 分页查询客户订单列表
@ -66,7 +72,14 @@ public class DfOrderController extends BaseController {
public TableDataInfo pageList(DfOrder dfOrder) {
startPage();
LambdaQueryWrapper<DfOrder> queryWrapper = new LambdaQueryWrapper();
condition(queryWrapper,dfOrder);
queryWrapper.orderByDesc(DfOrder::getSubmitTime);
boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
if (!admin) {
SysUser byId = userService.getById(SecurityUtils.getUserId());
if ("jj".equals(byId.getUserType())) {
queryWrapper.eq(DfOrder::getUserId,SecurityUtils.getUserId());
}
}
List<DfOrder> list = dfOrderService.list(queryWrapper);
List<SysUser> userList = userService.list();
List<DfBroker> brokerList = dfBrokerService.list();
@ -174,17 +187,35 @@ public class DfOrderController extends BaseController {
*
*/
@ApiOperation("新增客户订单")
@Log(title = "新增客户订单", businessType = BusinessType.INSERT)
@PostMapping("/visitorAdd")
@Anonymous
public AjaxResult visitorAdd(DfOrder dfOrder) {
Date date = new Date();
dfOrder.setCreateTimeVo(date);
SecurityUtils.getTenantId();
dfOrder.setTenantId(SecurityUtils.getTenantId());
dfOrderMapper.insertOrder(dfOrder);
List<DfOrder> dfOrders = dfOrderService.list(new LambdaQueryWrapper<DfOrder>().eq(DfOrder::getOrderNo, dfOrder.getOrderNo())
.eq(DfOrder::getUserId, dfOrder.getUserId())
.orderByDesc(DfOrder::getCreateTime));
if (Validator.isNotEmpty(dfOrder.getShareUser())) {
List<DfBizClue> list = dfBizClueService.list(new LambdaQueryWrapper<DfBizClue>().eq(DfBizClue::getShareUser, dfOrder.getShareUser())
.isNull(DfBizClue::getOrderId));
for (DfBizClue clue : list) {
clue.setOrderId(dfOrders.get(0).getId().toString());
dfBizClueMapper.updateClue(clue);
}
}
if (Validator.isNotEmpty(dfOrder.getUnionId())) {
List<DfBizClue> list = dfBizClueService.list(new LambdaQueryWrapper<DfBizClue>().eq(DfBizClue::getUnionId, dfOrder.getUnionId())
.isNull(DfBizClue::getOrderId));
for (DfBizClue clue : list) {
clue.setOrderId(dfOrders.get(0).getId().toString());
dfBizClueMapper.updateClue(clue);
}
}
// dfOrder.setTenantId(SecurityUtils.getTenantId());
// dfOrder.setCreateBy(SecurityUtils.getUserId());
dfOrder.setCreateDept(SecurityUtils.getDeptId());
return toAjax(dfOrderMapper.insertOrder(dfOrder));
// dfOrder.setCreateDept(SecurityUtils.getDeptId());
return toAjax(true);
}
/**

14
bs-admin/src/main/java/com/bs/df/controller/DfProductArticleController.java
Unescape View File

@ -9,9 +9,13 @@ import javax.servlet.http.HttpServletResponse;
import com.bs.cm.domain.CmAttach;
import com.bs.cm.service.ICmAttachService;
import com.bs.common.annotation.Anonymous;
import com.bs.common.core.domain.entity.SysUser;
import com.bs.common.utils.SecurityUtils;
import com.bs.df.domain.DfBizClue;
import com.bs.df.domain.DfProductMoment;
import com.bs.df.domain.DfProductPoster;
import com.bs.df.utils.HtmlUtils;
import com.bs.system.service.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@ -50,7 +54,8 @@ public class DfProductArticleController extends BaseController {
private IDfProductArticleService dfProductArticleService;
@Resource
private ICmAttachService cmAttachService;
@Resource
private ISysUserService userService;
/**
* 分页查询产品文章列表
*/
@ -59,6 +64,13 @@ public class DfProductArticleController extends BaseController {
public TableDataInfo pageList(DfProductArticle dfProductArticle) {
startPage();
LambdaQueryWrapper<DfProductArticle> queryWrapper = new LambdaQueryWrapper();
boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
if (!admin) {
SysUser byId = userService.getById(SecurityUtils.getUserId());
if ("jj".equals(byId.getUserType()) || "kh".equals(byId.getUserType())) {
queryWrapper.eq(DfProductArticle::getStatus,"1");
}
}
condition(queryWrapper,dfProductArticle);
List<DfProductArticle> list = dfProductArticleService.list(queryWrapper);
for (DfProductArticle article : list) {

13
bs-admin/src/main/java/com/bs/df/controller/DfProductMomentController.java
Unescape View File

@ -8,9 +8,12 @@ import javax.servlet.http.HttpServletResponse;
import com.bs.cm.domain.CmAttach;
import com.bs.cm.service.ICmAttachService;
import com.bs.common.core.domain.entity.SysUser;
import com.bs.common.utils.SecurityUtils;
import com.bs.df.domain.DfProductArticle;
import com.bs.df.domain.DfProductPoster;
import com.bs.df.utils.HtmlUtils;
import com.bs.system.service.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@ -49,7 +52,8 @@ public class DfProductMomentController extends BaseController {
private IDfProductMomentService dfProductMomentService;
@Resource
private ICmAttachService cmAttachService;
@Resource
private ISysUserService userService;
/**
* 分页查询产品朋友圈列表
*/
@ -59,6 +63,13 @@ public class DfProductMomentController extends BaseController {
startPage();
LambdaQueryWrapper<DfProductMoment> queryWrapper = new LambdaQueryWrapper();
condition(queryWrapper,dfProductMoment);
boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
if (!admin) {
SysUser byId = userService.getById(SecurityUtils.getUserId());
if ("jj".equals(byId.getUserType()) || "kh".equals(byId.getUserType())) {
queryWrapper.eq(DfProductMoment::getStatus,"1");
}
}
List<DfProductMoment> list = dfProductMomentService.list(queryWrapper);
List<CmAttach> attachVo = cmAttachService.list();
Map<String, List<CmAttach>> attachMap = attachVo.stream()

9
bs-admin/src/main/java/com/bs/df/domain/DfBizClue.java
Unescape View File

@ -93,6 +93,9 @@ public class DfBizClue extends BaseEntity{
@ApiModelProperty(value = "分享用户")
private String shareUser;
@ApiModelProperty(value = "订单id")
private String orderId;
/** 访问数量 */
@TableField(exist = false)
@ -120,5 +123,11 @@ public class DfBizClue extends BaseEntity{
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" )
private Date createTimeVo;
/**
* 为1时查询
*
* */
@TableField(exist = false)
private String hasOrder;
}

2
bs-admin/src/main/java/com/bs/df/mapper/DfBizClueMapper.java
Unescape View File

@ -15,4 +15,6 @@ public interface DfBizClueMapper extends BaseMapperX<DfBizClue> {
Boolean insertClue(@Param("dfBizClue") DfBizClue dfBizClue);
Boolean updateClue(@Param("dfBizClue") DfBizClue dfBizClue);
}

2
bs-admin/src/main/java/com/bs/web/controller/common/CommonController.java
Unescape View File

@ -63,7 +63,7 @@ public class CommonController {
}
String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
// String filePath = BsConfig.getUploadPath() + fileName;
String filePath = "D:/bs/uploadPath/download/2a582a06ed46ba81c45a77d8909b15c_20240423104003A001.jpg";
String filePath = "C:/bs/uploadPath/download/2a582a06ed46ba81c45a77d8909b15c_20240423104003A001.jpg";
response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
FileUtils.setAttachmentResponseHeader(response, realFileName);
FileUtils.writeBytes(filePath, response.getOutputStream());

44
bs-admin/src/main/java/com/bs/web/controller/system/SysLoginController.java
Unescape View File

@ -87,6 +87,21 @@ public class SysLoginController
// 生成令牌
String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
loginBody.getUuid());
if (StringUtils.isNotEmpty(loginBody.getUsername())) {
SysUser sysUser = sysUserMapper.selectOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, loginBody.getUsername()));
if (sysUser != null) {
if (StringUtils.isNotEmpty(loginBody.getXcxOpenId())) {
sysUser.setXcxOpenId(loginBody.getXcxOpenId());
}
if (StringUtils.isNotEmpty(loginBody.getGzhOpenId())) {
sysUser.setGzhOpenId(loginBody.getGzhOpenId());
}
if (StringUtils.isNotEmpty(loginBody.getUnionId())) {
sysUser.setUnionId(loginBody.getUnionId());
}
sysUserMapper.updateById(sysUser);
}
}
ajax.put(Constants.TOKEN, token);
return ajax;
}
@ -236,7 +251,6 @@ public class SysLoginController
*/
@PostMapping("/wxlogin")
@ApiOperation(value = "微信登入")
@Log(title = "用户登入(xcx)", businessType = BusinessType.GRANT)
@Anonymous
public AjaxResult wxlogin(@RequestBody LoginBody loginBody) {
AjaxResult ajax = AjaxResult.success();
@ -280,8 +294,9 @@ public class SysLoginController
loginBody.setXcxOpenId(user.getXcxOpenId());
//登入成功，查询租户配置
if (null != user.getTenantId()) {
SysTenant tenant = tenantService.getById(user.getTenantId());
TenantConfig config = tenantConfigService.getOne(new LambdaQueryWrapper<TenantConfig>().eq(TenantConfig::getTenantId, tenant.getId()));
// SysTenant tenant = tenantService.getById(user.getTenantId());
SysTenant tenant = tenantService.getById("5");
TenantConfig config = tenantConfigService.getOne(new LambdaQueryWrapper<TenantConfig>().eq(TenantConfig::getId, tenant.getId()));
if (config == null) {
config = new TenantConfig();
config.setIsUserAstrict("0");
@ -336,7 +351,7 @@ public class SysLoginController
*/
@PostMapping("/addVisitor")
@Anonymous
public DfBizClue addVisitor(LoginBody loginBody)
public AjaxResult addVisitor(@RequestBody LoginBody loginBody)
{
String nickname = null;
String headimgurl = null;
@ -344,10 +359,12 @@ public class SysLoginController
String openIdNew = null;
if (StringUtils.isNotEmpty(loginBody.getCode())) {
JSONObject gzhOpenId = weiXinUtil.getGZHOpenId(loginBody.getCode());
String refreshToken = gzhOpenId.getString("refreshToken");
JSONObject xinUtilRefreshToken = weiXinUtil.getRefreshToken(refreshToken);
String openid = xinUtilRefreshToken.getString("openId");
JSONObject userInfoBySnsapi = weiXinUtil.getUserInfoBySnsapi(openid);
// String refreshToken = gzhOpenId.getString("refreshToken");
// JSONObject xinUtilRefreshToken = weiXinUtil.getRefreshToken(refreshToken);
// String openid = xinUtilRefreshToken.getString("openId");
String openid = gzhOpenId.getString("openId");
String accessToken = gzhOpenId.getString("accessToken");
JSONObject userInfoBySnsapi = weiXinUtil.getUserInfoBySnsapi(accessToken,openid);
nickname = userInfoBySnsapi.getString("nickname");
headimgurl = userInfoBySnsapi.getString("headimgurl");
unionId = userInfoBySnsapi.getString("unionid");
@ -367,14 +384,15 @@ public class SysLoginController
dfBizClue.setUnionId(unionId);
dfBizClue.setOpenId(openIdNew);
dfBizClue.setCreateTimeVo(new Date());
dfBizClue.setTenantId(SecurityUtils.getTenantId());
if (StringUtils.isNotEmpty(nickname)) {
dfBizClueMapper.insertClue(dfBizClue);
}
dfBizClue.setTenantId(0L);
// dfBizClue.setTenantId(SecurityUtils.getTenantId());
// if (StringUtils.isNotEmpty(nickname)) {
dfBizClueMapper.insertClue(dfBizClue);
// }
// AjaxResult ajax = AjaxResult.success();
// ajax.put("openid", openIdNew);
// ajax.put("unionid",unionId);
return dfBizClue;
return AjaxResult.success(dfBizClue);
}
/**

21
bs-admin/src/main/java/com/bs/web/utils/WeiXinUtil.java
Unescape View File

@ -220,11 +220,10 @@ public class WeiXinUtil {
* 描述：刷新access_token
*/
public Map<String, String> getConfig(String url) {
Map<String, String> sign = null;
Map<String, String> sign = new HashMap<>();
try {
String titcket = getTitcket();
sign = SignUtil.sign(titcket, url);
sign.put("titcket", titcket);
} catch (Exception e) {
e.printStackTrace();
}
@ -292,8 +291,8 @@ public class WeiXinUtil {
/**
* 描述：拉取用户信息
*/
public JSONObject getUserInfoBySnsapi(String openid) {
String url = "https://api.weixin.qq.com/sns/userinfo?access_token?appid=" + gzhappid + "&openid=" + openid
public JSONObject getUserInfoBySnsapi(String accessToken,String openid) {
String url = "https://api.weixin.qq.com/sns/userinfo?access_token=" + accessToken + "&openid=" + openid
+ "&lang=zh_CN";
try {
log.info("获取用户信息请求url：" + url);
@ -563,7 +562,15 @@ public class WeiXinUtil {
SysConfig config = new SysConfig();
config.setConfigKey("access_token");
List<SysConfig> sysConfigs = sysConfigService.selectConfigList(config);
SysConfig sysConfig = sysConfigs.get(0);
SysConfig sysConfig = new SysConfig();
if (null != sysConfigs && sysConfigs.size() > 0) {
sysConfig = sysConfigs.get(0);
} else {
sysConfig.setConfigKey("access_token");
sysConfig.setConfigName("微信公众号的access_token");
sysConfig.setRemark("微信公众号的access_token，存的是Json 对象，有三个字段：accessToken:accessToken，expirettime:过期时间戳，createtime：创建时间戳");
sysConfig.setConfigType("Y");
}
String url = "https://api.weixin.qq.com/cgi-bin/stable_token";
log.info("获取Access_token请求url：" + url);
JSONObject sendObject = new JSONObject();
@ -1026,17 +1033,13 @@ public class WeiXinUtil {
}
public String getTitcket() throws Exception {
String accessToken = getAccess_token(gzhappid, gzhappsecret);
System.out.println(accessToken);
String url = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=" + accessToken + "&type=jsapi";
String returnValue = httpGet(url,null);
JSONObject jsonObject = JSONObject.parseObject(returnValue);
String ticket = jsonObject.getString("ticket");
log.info("getTitcket返回数据：" + jsonObject);
return ticket;
}

12
bs-admin/src/main/resources/mapper/biz/DfBizClueMapper.xml
Unescape View File

@ -6,11 +6,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertClue" parameterType="com.bs.df.domain.DfBizClue">
INSERT INTO df_biz_clue(data_type,clue_type,user_id,nick_name,browse_time,avatar_link,phone,create_dept,create_by,create_time,tenant_id,
business_links,union_id,open_id,share_user,from_type)
business_links,union_id,open_id,share_user,from_type,order_id)
VALUES(#{dfBizClue.dataType},#{dfBizClue.clueType},#{dfBizClue.userId},#{dfBizClue.nickName},#{dfBizClue.browseTime},#{dfBizClue.avatarLink},
#{dfBizClue.phone},#{dfBizClue.createDept},#{dfBizClue.createBy},#{dfBizClue.createTimeVo},#{dfBizClue.tenantId},#{dfBizClue.businessLinks}
,#{dfBizClue.unionId},#{dfBizClue.openId},#{dfBizClue.shareUser},#{dfBizClue.fromType})
,#{dfBizClue.unionId},#{dfBizClue.openId},#{dfBizClue.shareUser},#{dfBizClue.fromType},#{dfBizClue.orderId})
</insert>
<update id="updateClue" parameterType="com.bs.df.domain.DfBizClue">
UPDATE df_biz_clue
SET
order_id = #{dfBizClue.orderId}
WHERE id = #{dfBizClue.id}
</update>
</mapper>

4
bs-admin/src/main/resources/mapper/order/DfOrderMapper.xml
Unescape View File

@ -7,10 +7,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertOrder" parameterType="com.bs.df.domain.DfOrder">
INSERT INTO df_order (order_no, user_id, broker_id, product_id, product_name, submit_time, apply_amount,
limit_amount, loan_amount, loan_rate, load_month, is_first,
settle_amount, staus, remark, create_dept, create_by, create_time, tenant_id,share_user,from_type)
settle_amount, staus, remark, create_dept, create_by, create_time, tenant_id,share_user,from_type,open_id,union_id)
VALUES (#{dfOrder.orderNo}, #{dfOrder.userId}, #{dfOrder.brokerId}, #{dfOrder.productId}, #{dfOrder.productName}, #{dfOrder.submitTime}, #{dfOrder.applyAmount}, #{dfOrder.limitAmount}, #{dfOrder.loanAmount}, #{dfOrder.loanRate}, #{dfOrder.loadMonth}, #{dfOrder.isFirst},
#{dfOrder.settleAmount}, #{dfOrder.staus}, #{dfOrder.remark}, #{dfOrder.createDept}, #{dfOrder.createBy},
#{dfOrder.createTimeVo}, #{dfOrder.tenantId},#{dfOrder.shareUser},#{dfOrder.fromType})
#{dfOrder.createTimeVo}, #{dfOrder.tenantId},#{dfOrder.shareUser},#{dfOrder.fromType},#{dfOrder.openId},#{dfOrder.unionId})
</insert>
</mapper>

2
bs-system/src/main/java/com/bs/system/service/impl/SysConfigServiceImpl.java
Unescape View File

@ -65,7 +65,9 @@ public class SysConfigServiceImpl implements ISysConfigService
@Override
public String selectConfigByKey(String configKey)
{
//redisCache.deleteObject(getCacheKey(configKey));
String configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey)));
//redisCache.deleteObject(getCacheKey(getCacheKey(configKey)));
if (StringUtils.isNotEmpty(configValue))
{
return configValue;

Write Preview
Loading…
Cancel
Save