记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit e327a2f5 authored by 张禹's avatar 张禹
Browse files
Options

Merge branch 'pre' into 'master' 

Pre

See merge request !251
parents 8653580a ed0cec6f
Show whitespace changes
Inline Side-by-side
Showing with 427 additions and 68 deletions
liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SmileSchoolVo.java
View file @ e327a2f5
package com.liquidnet.service.goblin.dto.vo;
import com.liquidnet.service.smile.entity.SmileSchool;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -20,6 +21,8 @@ public class SmileSchoolVo implements Serializable {
private Long id;
private String schoolId;
/**
* 学校名称
*/
......@@ -69,4 +72,21 @@ public class SmileSchoolVo implements Serializable {
private String area;
public SmileSchoolVo copy(SmileSchool smileSchool) {
//KylinApiCameraDevicesVo kylinApiCameraDevicesVo = KylinApiCameraDevicesVo.getNew();
// if (null == source) return null;
SmileSchoolVo smileSchoolVo = new SmileSchoolVo();
if (null==smileSchool) return null;
smileSchoolVo.setId(smileSchool.getId());
smileSchoolVo.setSchoolId(smileSchool.getId().toString());
smileSchoolVo.setName(smileSchool.getName());
smileSchoolVo.setAddress(smileSchool.getAddress());
smileSchoolVo.setProvinceKey(smileSchool.getProvinceId());
smileSchoolVo.setProvince(smileSchool.getProvince());
smileSchoolVo.setCityKey(smileSchool.getCityId());
smileSchoolVo.setCity(smileSchool.getCity());
smileSchoolVo.setAreaKey(smileSchool.getAreaId());
smileSchoolVo.setArea(smileSchool.getArea());
return smileSchoolVo;
}
}
liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/service/manage/SmileFrontService.java
View file @ e327a2f5
package com.liquidnet.service.goblin.service.manage;
import com.liquidnet.service.goblin.dto.vo.SmileSchoolVo;
import com.liquidnet.service.goblin.dto.vo.SmileSellDataDetailVO;
import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
......@@ -11,6 +12,7 @@ public interface SmileFrontService {
public boolean saveOrUpdateUser(SmileUserVO smileUserVO,SmileUserVO redisVo,String type);
public List<KylinPerformanceVo> getPerformance();
public void deleteUser(String uid);
public boolean auth(String uid,SmileUserVO redisVo);
public boolean auth(String uid,SmileUserVO redisVo,boolean b);
public SmileSellDataDetailVO getSellDataDetail(String agentId, String ticketId, String activeName, String ticketName);
public List<SmileSchoolVo> getSchool(String name);
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/bootstrap-dev.yml
View file @ e327a2f5
......@@ -6,7 +6,7 @@ liquidnet:
username: user
password: user123
eureka:
host: 39.107.71.112:7001
host: 127.0.0.1:7001
# end-dev-这里是配置信息基本值
spring:
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/userPendingList/detail.html
View file @ e327a2f5
......@@ -33,6 +33,10 @@
<div class="detail_inner detail_idcode"></div>
<p class="detail_title">自我介绍</p>
<div class="detail_inner detail_desc"></div>
<p class="detail_title">个人技能(选填)</p>
<div class="detail_inner detail_desc1"></div>
<div class="detail_inner detail_desc2"></div>
<div class="detail_inner detail_desc3"></div>
<p>手机号：</p>
<div class="detail_inner detail_mobail"></div>
<!--<p>提交时间：</p>-->
......@@ -124,6 +128,9 @@
$('.detail_name').text(detailData.name);
$('.detail_idcode').text(detailData.idCard);
$('.detail_desc').text(detailData.introduce);
$('.detail_desc1').text(detailData.specialty1);
$('.detail_desc2').text(detailData.specialty2);
$('.detail_desc3').text(detailData.specialty3);
$('.detail_mobail').text(detailData.phone);
$('.detail_created').text(detailData.createdDate);
if (detailData.type != 0) {
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/edit.html
View file @ e327a2f5
......@@ -29,7 +29,7 @@
<label class="col-sm-3 control-label is-required">头像：</label>
<div class="col-sm-8">
<!-- <input name="img" class="form-control" type="text" th:value="*{img}" readonly required>-->
<img class="img-details" name="img" th:src="*{img}"
<img class="img-details" style="height: 800px;" name="img" th:src="*{img}"
th:onclick="click_big([[*{img}]])">
</div>
</div>
......@@ -60,12 +60,12 @@
required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">专长：</label>
<div class="col-sm-8">
<input name="specialty" class="form-control" type="text" th:value="*{specialty}" readonly required>
</div>
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label is-required">专长：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="specialty" class="form-control" type="text" th:value="*{specialty}" readonly required>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label is-required">特长：</label>
<div class="col-sm-8">
......@@ -150,6 +150,27 @@
focusCleanup: true
});
// 点击图片放大
function click_big(url) {
var img_url = url
if (url.indexOf("x-oss-process") != "-1") {
img_url = url.split("?")[0]
}
var json = {
"data": [ //相册包含的图片，数组格式
{
"alt": "图片",
"src": img_url, //原图地址
}
]
};
layer.photos({
photos: json,
closeBtn: 1, //右上角按钮，可通过配置1和2来展示，如果不显示，则closeBtn: 0
anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机（请注意，3.0之前的版本用shift参数）
});
}
function submitHandler(status) {
var teamIds = $("input[name^='teamCheck']:checked").val()
var uid = $("input[name^='uid']").val()
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/list.html
View file @ e327a2f5
......@@ -30,6 +30,14 @@
<label>手机号：</label>
<input type="text" name="phone"/>
</li>
<li>
<label>性别：</label>
<select name="sex">
<option value="-1">全部</option>
<option value="1">男</option>
<option value="2">女</option>
</select>
</li>
<li>
<label>审核状态：</label>
<select name="status">
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/project/list.html
View file @ e327a2f5
......@@ -53,29 +53,61 @@
columns: [{
checkbox: true
},
{
field: 'projectId',
title: '活动id'
},
// {
// field: 'projectId',
// title: '活动id'
// },
{
field: 'title',
title: '活动名称'
},
{
field: 'img',
title: '封面图',
formatter: function (value, row, index) {
return $.table.imageView(value, "300", "300");
}
field: 'all',
title: '报名人数'
},
{
field: 'unAudit',
title: '待审核'
},
{
field: 'audit',
title: '审核通过'
},
{
field: 'refuse',
title: '已拒绝'
},
// {
// field: 'img',
// title: '封面图',
// formatter: function (value, row, index) {
// return $.table.imageView(value, "300", "300");
// }
// },
{
field: 'timeStart',
title: '开始时间'
title: '活动时间',
formatter: function (value, row, index) {
return row.timeStart.split("T")[0] +" 至 "+row.timeEnd.split("T")[0]
}
},
{
field: 'timeEnd',
title: '结束时间'
field: 'timeStatus',
title: '活动状态',
formatter: function (value, row, index) {
if(value===1){
return "活动中"
}else{
return "已结束";
}
}
},
// {
// field: 'timeEnd',
// title: '结束时间'
// },
{
field: 'createdAt',
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/test/java/com.liquidnet.client.admin/TestLocal.java
View file @ e327a2f5
package com.liquidnet.client.admin;
import com.liquidnet.client.admin.common.utils.security.Md5Utils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.liquidnet.commons.lang.constant.LnsEnum;
import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.commons.lang.util.MD5;
import com.liquidnet.service.goblin.dto.vo.SmileSchoolVo;
import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
import com.liquidnet.service.smile.entity.SmileSchool;
import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
import com.mongodb.BasicDBObject;
import com.mongodb.client.result.UpdateResult;
import org.junit.Test;
......@@ -23,6 +27,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
/**
* Test
......@@ -69,4 +74,18 @@ public class TestLocal {
boolean contains = Arrays.asList(LnsEnum.ENV.dev.name(), LnsEnum.ENV.test.name()).contains(environment.getProperty(CurrentUtil.CK_ENV_ACTIVE));
System.out.println(contains);
}
@Autowired
private SmileSchoolMapper smileSchoolMapper;
@Test
public void testSaveSmileSchoolMongodb(){
LambdaQueryWrapper<SmileSchool> queryWrapper = Wrappers.lambdaQuery(SmileSchool.class);
queryWrapper.eq(SmileSchool::getDelTag,0);
List<SmileSchool> smileSchools = smileSchoolMapper.selectList(queryWrapper);
smileSchools.forEach(smileSchool->{
SmileSchoolVo smileSchoolVo = new SmileSchoolVo().copy(smileSchool);
mongoTemplate.insert(smileSchoolVo, SmileSchoolVo.class.getSimpleName());
});
};
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileVSParam.java
View file @ e327a2f5
......@@ -19,6 +19,8 @@ public class SmileVSParam {
private String phone;
@ApiModelProperty(value = "审核状态", example = "")
private Integer status;
@ApiModelProperty(value = "性别[1-男|2-女]", example = "")
private Integer sex;
@ApiModelProperty(value = "职责组名称", example = "")
private String team;
@ApiModelProperty(value = "活动id", example = "")
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileVolunteersProjectService.java
View file @ e327a2f5
......@@ -7,6 +7,7 @@ import com.liquidnet.client.admin.zhengzai.smile.dto.SmileVPSParam;
import com.liquidnet.service.goblin.dto.vo.SmileProjectDetailsVo;
import com.liquidnet.service.smile.entity.SmileVolunteersProject;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.smile.entity.dto.SmileVolunteersProjectListDto;
import java.util.List;
......@@ -21,7 +22,7 @@ import java.util.List;
public interface ISmileVolunteersProjectService extends IService<SmileVolunteersProject> {
//活动列表
List<SmileVolunteersProject> list(SmileVPSParam param);
List<SmileVolunteersProjectListDto> list(SmileVPSParam param);
//活动添加
AjaxResult insertData(SmileVPParam param);
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileSchoolServiceImpl.java
View file @ e327a2f5
......@@ -16,10 +16,14 @@ import com.liquidnet.service.smile.entity.SmileUser;
import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
import com.liquidnet.service.smile.mapper.SmileUserMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
......@@ -45,11 +49,14 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
@Autowired
SmileRedisUtils smileRedisUtils;
@Autowired
MongoTemplate mongoTemplate;
@Override
public PageInfo<SmileSchool> schoolList(SmileSchoolParam smileSchoolParam) {
PageInfo<SmileSchool> pageInfo;
try {
Map<String,Object> map = BeanUtil.convertBeanToMap(smileSchoolParam);
Map<String, Object> map = BeanUtil.convertBeanToMap(smileSchoolParam);
List<SmileSchool> smileSchools = smileSchoolMapper.selectSchoolList(map);
pageInfo = new PageInfo<>(smileSchools);
} catch (Exception e) {
......@@ -69,27 +76,35 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
log.debug("smileSchool:{}", smileSchool);
LambdaQueryWrapper<SmileSchool> queryWrapper = Wrappers.lambdaQuery(SmileSchool.class);
queryWrapper.eq(SmileSchool::getName, smileSchool.getName());
queryWrapper.eq(SmileSchool::getDelTag,0);
queryWrapper.eq(SmileSchool::getDelTag, 0);
if (smileSchoolMapper.selectOne(queryWrapper) == null) {
smileSchoolMapper.insert(smileSchool);
//保存学校
smileRedisUtils.setSchool(String.valueOf(smileSchool.getId()),smileSchool.getName());
smileRedisUtils.setSchool(String.valueOf(smileSchool.getId()), smileSchool.getName());
SmileSchoolVo smileSchoolVo = new SmileSchoolVo().copy(smileSchool);
mongoTemplate.insert(smileSchoolVo, SmileSchoolVo.class.getSimpleName());
//判断是否需要新增redis
List<SmileSchoolVo> schoolAll = smileRedisUtils.getSchoolAll();
if (schoolAll != null && schoolAll.size() < 20) {
updateSchoolRedis();
}
return AjaxResult.success();
}
return AjaxResult.warn("学校已存在");
}
@Override
public AjaxResult updateSchoolById(SmileSchool smileSchool) {
LambdaQueryWrapper<SmileSchool> queryWrapper = Wrappers.lambdaQuery(SmileSchool.class);
queryWrapper.eq(SmileSchool::getId, smileSchool.getId());
queryWrapper.eq(SmileSchool::getDelTag,0);
queryWrapper.eq(SmileSchool::getDelTag, 0);
if (smileSchoolMapper.update(smileSchool, queryWrapper) > 0) {
//更新User表 根据学校id修改用户学校名称
smileUserMapper.updateUserSchoolBySchoolId(smileSchool.getId().toString(), smileSchool.getName());
smileRedisUtils.setSchool(String.valueOf(smileSchool.getId()),smileSchool.getName());
smileRedisUtils.setSchool(String.valueOf(smileSchool.getId()), smileSchool.getName());
//修改数据
SmileSchoolVo smileSchoolVo = new SmileSchoolVo().copy(smileSchool);
mongoTemplate.save(smileSchoolVo, SmileSchoolVo.class.getSimpleName());
//更新redis
updateSchoolRedis();
return AjaxResult.success();
......@@ -101,14 +116,17 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
public AjaxResult del(Long id) {
//查询是否有用户使用过该学校
LambdaQueryWrapper<SmileUser> queryWrapper = Wrappers.lambdaQuery(SmileUser.class);
queryWrapper.eq(SmileUser::getSchoolId,id);
queryWrapper.eq(SmileUser::getDelTag,0);
queryWrapper.eq(SmileUser::getSchoolId, id);
queryWrapper.eq(SmileUser::getDelTag, 0);
List<SmileUser> smileUsers = smileUserMapper.selectList(queryWrapper);
if (smileUsers.size() > 0){
if (smileUsers.size() > 0) {
return AjaxResult.warn("该学校已被使用，不可删除");
}
//学校没有被使用 可以删除
smileSchoolMapper.updateDel(id);
//mongodb删除
Query query = new Query(Criteria.where("id").is(id));
mongoTemplate.remove(query, SmileSchoolVo.class, SmileSchoolVo.class.getSimpleName());
smileRedisUtils.delSchool(String.valueOf(id));
updateSchoolRedis();
return AjaxResult.success();
......@@ -118,16 +136,42 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
private void updateSchoolRedis() {
List<SmileSchoolVo> smileSchoolVos = new ArrayList<>();
smileSchoolMapper.selectListLimit().forEach(smileSchool -> {
SmileSchoolVo smileSchoolVo = new SmileSchoolVo();
try {
BeanUtils.copyProperties(smileSchool,smileSchoolVo);
SmileSchoolVo smileSchoolVo = new SmileSchoolVo().copy(smileSchool);
smileSchoolVos.add(smileSchoolVo);
}catch (Exception e) {
e.printStackTrace();
}
});
smileRedisUtils.setSchoolAll(smileSchoolVos);
}
public void saveSmileSchoolMongodb() {
LambdaQueryWrapper<SmileSchool> queryWrapper = Wrappers.lambdaQuery(SmileSchool.class);
queryWrapper.eq(SmileSchool::getDelTag, 0);
List<SmileSchool> smileSchools = smileSchoolMapper.selectList(queryWrapper);
smileSchools.forEach(smileSchool -> {
SmileSchoolVo smileSchoolVo = new SmileSchoolVo().copy(smileSchool);
try {
mongoTemplate.insert(smileSchoolVo, SmileSchoolVo.class.getSimpleName());
} catch (Exception e) {
log.debug("数据存在：{}", smileSchoolVo);
}
});
}
/**
* 跟新redis中学校SmileSchoolVo类：dev_kids0609初始化
*/
@PostConstruct
private void updateRedisSchoolAll() {
Query query = new Query();
long count = mongoTemplate.count(query, SmileSchoolVo.class.getSimpleName());
if (count == 0) {
//删除旧redisSchoolAll缓存
smileRedisUtils.delSchoolAll();
//跟新缓存
updateSchoolRedis();
//mongodb初始化就数据
saveSmileSchoolMongodb();
}
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileVolunteersProjectServiceImpl.java
View file @ e327a2f5
......@@ -15,6 +15,7 @@ import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.smile.entity.SmileProjectTeamRelation;
import com.liquidnet.service.smile.entity.SmileVolunteersProject;
import com.liquidnet.service.smile.entity.SmileVolunteersTeam;
import com.liquidnet.service.smile.entity.dto.SmileVolunteersProjectListDto;
import com.liquidnet.service.smile.mapper.SmileProjectTeamRelationMapper;
import com.liquidnet.service.smile.mapper.SmileVolunteersProjectMapper;
import com.liquidnet.service.smile.mapper.SmileVolunteersTeamMapper;
......@@ -44,15 +45,15 @@ public class SmileVolunteersProjectServiceImpl extends ServiceImpl<SmileVoluntee
SmileRedisUtils redisUtils;
@Override
public List<SmileVolunteersProject> list(SmileVPSParam param) {
public List<SmileVolunteersProjectListDto> list(SmileVPSParam param) {
try {
TableDataInfo rspData = new TableDataInfo();
LambdaQueryWrapper<SmileVolunteersProject> wrappers = Wrappers.lambdaQuery(SmileVolunteersProject.class);
if (param.getTitle() != null && !param.getTitle().equals("")) {
wrappers.like(SmileVolunteersProject::getTitle, param.getTitle());
}
wrappers.orderByDesc(SmileVolunteersProject::getCreatedAt);
List<SmileVolunteersProject> data = volunteersProjectMapper.selectList(wrappers);
// LambdaQueryWrapper<SmileVolunteersProject> wrappers = Wrappers.lambdaQuery(SmileVolunteersProject.class);
// if (param.getTitle() != null && !param.getTitle().equals("")) {
// wrappers.like(SmileVolunteersProject::getTitle, param.getTitle());
// }
// wrappers.orderByDesc(SmileVolunteersProject::getCreatedAt);
// List<SmileVolunteersProject> data = volunteersProjectMapper.selectList(wrappers);
List<SmileVolunteersProjectListDto> data = volunteersProjectMapper.selectProjectList(param.getTitle());
return data;
} catch (Exception e) {
e.printStackTrace();
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileVolunteersServiceImpl.java
View file @ e327a2f5
......@@ -81,6 +81,7 @@ public class SmileVolunteersServiceImpl extends ServiceImpl<SmileVolunteersMappe
map.put("title", param.getTitle() == null ? "" : param.getTitle());
map.put("status", param.getStatus() + "");
map.put("projectId", param.getProjectId());
map.put("sex", param.getSex().toString());
List<VolunteersExportDto> dtoList = volunteersMapper.expertVolunteer(map);
return dtoList;
} catch (Exception e) {
......@@ -160,6 +161,7 @@ public class SmileVolunteersServiceImpl extends ServiceImpl<SmileVolunteersMappe
map.put("team", param.getTeam());
map.put("title", param.getTitle() == null ? "" : param.getTitle());
map.put("status", param.getStatus() + "");
map.put("sex", param.getSex().toString());
map.put("projectId", param.getProjectId());
List<VolunteersExportDto> dtoList = volunteersMapper.expertVolunteer(map);
List<VolunteersExportVo> voList = new ArrayList();
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/utils/SmileRedisUtils.java
View file @ e327a2f5
......@@ -58,6 +58,13 @@ public class SmileRedisUtils {
return (String) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
}
/**
* 根据学校id删除学校
*/
public void delSchoolNameById(String schoolId) {
redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
}
/**
* 保存/更新学校
*/
......@@ -72,6 +79,20 @@ public class SmileRedisUtils {
redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_SCHOOL, smileSchoolVos);
}
/**
* 删除缓存学校集合
*/
public void delSchoolAll() {
redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SMILE_SCHOOL);
}
/**
* 获取全部学校
*/
public List<SmileSchoolVo> getSchoolAll() {
return (List<SmileSchoolVo>)redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_SCHOOL);
}
/**
* 删除学校
*/
......
liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisUtil.java
View file @ e327a2f5
......@@ -34,7 +34,7 @@ public final class RedisUtil extends AbstractRedisUtil{
public static void main(String[] args) {
String[] keys = {
"smile:show",
"smile:school",
};
for (String key : keys) {
long value = key.hashCode();
......
liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/dto/SmileVolunteersProjectListDto.java 0 → 100644
View file @ e327a2f5
package com.liquidnet.service.smile.entity.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 志愿者-志愿者项目表
* </p>
*
* @author jiangxiulong
* @since 2022-04-01
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class SmileVolunteersProjectListDto implements Serializable, Cloneable {
private static final long serialVersionUID = 1L;
/**
* 活动id
*/
private String projectId;
/**
* 项目名称
*/
private String title;
/**
* 开始时间
*/
private LocalDateTime timeStart;
/**
* 结束时间
*/
private LocalDateTime timeEnd;
/**
* 状态[1-上线|0-下线]
*/
private Integer status;
/**
* 创建时间
*/
private LocalDateTime createdAt;
/**
* 活动状态 [1开始|2结束]
*/
private Integer timeStatus;
/**
* 报名人数
*/
private Integer all;
/**
* 待审核人数
*/
private Integer unAudit;
/**
* 审核人数
*/
private Integer audit;
/**
* 拒绝人数
*/
private Integer refuse;
private static final SmileVolunteersProjectListDto obj = new SmileVolunteersProjectListDto();
public static SmileVolunteersProjectListDto getNew() {
try {
return (SmileVolunteersProjectListDto) obj.clone();
} catch (CloneNotSupportedException e) {
return new SmileVolunteersProjectListDto();
}
}
}
liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/mapper/SmileVolunteersProjectMapper.java
View file @ e327a2f5
......@@ -2,6 +2,9 @@ package com.liquidnet.service.smile.mapper;
import com.liquidnet.service.smile.entity.SmileVolunteersProject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.liquidnet.service.smile.entity.dto.SmileVolunteersProjectListDto;
import java.util.List;
/**
* <p>
......@@ -15,4 +18,5 @@ public interface SmileVolunteersProjectMapper extends BaseMapper<SmileVolunteers
void getDetailsById(String projectId);
List<SmileVolunteersProjectListDto> selectProjectList(String title);
}
liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileSchoolMapper.xml
View file @ e327a2f5
......@@ -3,7 +3,7 @@
<mapper namespace="com.liquidnet.service.smile.mapper.SmileSchoolMapper">
<select id="selectListLimit" resultType="com.liquidnet.service.smile.entity.SmileSchool">
select id,name from smile_school where `del_tag` = 0;
select id,name from smile_school where `del_tag` = 0 LIMIT 20;
</select>
<select id="selectSchoolList" parameterType="java.util.Map" resultType="com.liquidnet.service.smile.entity.SmileSchool">
......
liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileVolunteersMapper.xml
View file @ e327a2f5
......@@ -73,6 +73,9 @@
<if test="status!='-1'">
AND sv.status = #{status}
</if>
<if test="sex!='-1'">
AND sex = #{sex}
</if>
<if test="team!=''">
AND (svt1.name = #{team} OR svt2.name = #{team} OR svt3.name = #{team})
</if>
......
liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileVolunteersProjectMapper.xml
View file @ e327a2f5
......@@ -2,6 +2,21 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.liquidnet.service.smile.mapper.SmileVolunteersProjectMapper">
<resultMap id="smileVolunteersProjectListDto" type="com.liquidnet.service.smile.entity.dto.SmileVolunteersProjectListDto">
<result column="project_id" property="projectId"/>
<result column="title" property="title"/>
<result column="status" property="status"/>
<result column="time_start" property="timeStart"/>
<result column="time_end" property="timeEnd"/>
<result column="created_at" property="createdAt"/>
<result column="time_status" property="timeStatus"/>
<result column="all" property="all"/>
<result column="un_audit" property="unAudit"/>
<result column="audit" property="audit"/>
<result column="refuse" property="refuse"/>
</resultMap>
<select id="selectUserList" resultType="com.liquidnet.service.smile.entity.SmileUser">
select * from smile_user
<where>
......@@ -13,4 +28,29 @@
ORDER BY id desc
</select>
<select id="selectProjectList" resultType="com.liquidnet.service.smile.entity.dto.SmileVolunteersProjectListDto">
select a.project_id,
title,
a.time_start,
a.time_end,
a.created_at,
a.status,
IF(now() >time_end,2,1) as 'time_status',
count(b0.project_id) + count(b1.project_id) + count(b2.project_id) as 'all',
count(b0.project_id) as 'un_audit',
count(b1.project_id) as 'audit',
count(b2.project_id) as 'refuse'
from smile_volunteers_project as a
LEFT JOIN smile_volunteers as b0 on a.project_id = b0.project_id and b0.status = 0
LEFT JOIN smile_volunteers as b1 on a.project_id = b1.project_id and b1.status = 1
LEFT JOIN smile_volunteers as b2 on a.project_id = b2.project_id and b2.status = 2
<where>
<if test="title!='' and title !=null">
AND title Like concat('%',#{title},'%')
</if>
</where>
GROUP BY a.project_id
ORDER BY a.created_at desc
</select>
</mapper>
liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/docu/db_ln_goblin_initialdata.sql
View file @ e327a2f5
......@@ -39,7 +39,7 @@ CREATE TABLE `smile_user` (
`id_card` varchar(18) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '身份证号',
`school_id` varchar(9) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '学校关联ID',
`school_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '学校名称',
`school_major` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '专业',
`school_major` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '专业',
`identity` int NULL DEFAULT NULL COMMENT '身份（1:在校学生（默认），2已毕业）',
`tag` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '标识步骤',
`agent` int NULL DEFAULT NULL COMMENT '1：代理开启，2：代理关闭',
......
liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/docu/mongo_db_ddl.sql
View file @ e327a2f5
......@@ -2,10 +2,13 @@ use test_ln_scene;
// ================================================== 创建集合
db.createCollection("SmileSellDataDetailVO");
db.createCollection("SmileSellDataVO");
db.createCollection("SmileSchoolVo");
// ================================================== 创建索引
db.SmileSellDataDetailVO.createIndex({dataId:"hashed"});
db.SmileSellDataVO.createIndex({sellDataId:"hashed"});
db.SmileSchoolVo.createIndex({schoolId:"hashed"})
================================================== 创建分片
sh.enableSharding("test_ln_scene");
sh.shardCollection("test_ln_scene.SmileSellDataDetailVO",{"dataId":"hashed"});
sh.shardCollection("test_ln_scene.SmileSellDataVO",{"sellDataId":"hashed"});
sh.shardCollection("test_ln_scene.SmileSchoolVo",{"schoolId":"hashed"});
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/controller/SmileUserController.java
View file @ e327a2f5
......@@ -46,14 +46,22 @@ public class SmileUserController {
}
@GetMapping("getSchool")
@ApiOperation("获得学校")
public ResponseDto<List<SmileSchoolVo>> getSchool() {
public ResponseDto<List<SmileSchoolVo>> getSchool(String name) {
/* String userId = CurrentUtil.getCurrentUid();
List<SmileSchoolVo> list=null;
if(redisUtil.hasKey(SmileRedisConst.SMILE_SCHOOL)){
list= (List<SmileSchoolVo>) redisUtil.get(SmileRedisConst.SMILE_SCHOOL);
}*/
if(StringUtil.isNotBlank(name)){
//mongodb 搜索
return ResponseDto.success(smileFrontService.getSchool(name));
}else{
return ResponseDto.success(smileRedisUtils.getSchool());
}
}
@GetMapping("getPerformance")
@ApiOperation("获得演出列表")
public ResponseDto<List<KylinPerformanceVo>> getPerformance() {
......@@ -97,14 +105,19 @@ public class SmileUserController {
if(!(smileUserVORedis.getTag().contains("1")&&smileUserVORedis.getTag().contains("2")&&smileUserVORedis.getTag().contains("3"))){
return ResponseDto.failure("用户信息不全，请填写后提交认证");
}
//smileRedisUtils.setSmileUserVo(userId,smileUserVORedis);
if(null!=smileUserVORedis.getType()&&smileUserVORedis.getType()==4){
smileFrontService.deleteUser(userId);
}
/*smileFrontService.deleteUser(userId);*/
smileUserVORedis.setAuthStatus(1);
smileUserVORedis.setType(0);
smileRedisUtils.setSmileUserVo(userId,smileUserVORedis);
smileFrontService.auth(userId,smileUserVORedis,false);
}else{
smileUserVORedis.setAuthStatus(1);
smileUserVORedis.setType(0);
smileFrontService.auth(userId,smileUserVORedis,true);
}
//redisUtil.set(SmileRedisConst.SMILE_USER.concat(userId),smileUserVORedis);
return ResponseDto.success(smileFrontService.auth(userId,smileUserVORedis));
return ResponseDto.success();
}
}
return ResponseDto.failure("没有该用户信息");
......@@ -147,6 +160,7 @@ public class SmileUserController {
}
if(StringUtil.isNotBlank(smileUserVO.getIdCard())&&StringUtil.isNotBlank(smileUserVO.getName())){
String userId = CurrentUtil.getCurrentUid();
/* String status=smileRedisUtils.getValidate(smileUserVO.getName(), smileUserVO.getIdCard());*/
if(utils.validate(smileUserVO.getName(),smileUserVO.getIdCard())){
smileUserVO.setUid(userId);
SmileUserVO smileUserVORedis=smileRedisUtils.getSmileUserVo(userId);
......@@ -155,6 +169,10 @@ public class SmileUserController {
return ResponseDto.failure("用户状态不对");
}
smileUserVO.setTag("2");
//查看这个身份证有没有被用过
/* if(StringUtil.isNotBlank(status)){
return ResponseDto.failure("该身份证已经有账号绑定了！");
}*/
smileFrontService.saveOrUpdateUser(smileUserVO,smileUserVORedis,"2");
}else {
return ResponseDto.failure("验证身份证失败！");
......
liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/service/impl/SmileFrontServiceImpl.java
View file @ e327a2f5
......@@ -3,6 +3,7 @@ package com.liquidnet.service.service.impl;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.base.constant.MQConst;
import com.liquidnet.service.goblin.dto.vo.SmileSchoolVo;
import com.liquidnet.service.goblin.dto.vo.SmileSellDataDetailVO;
import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
import com.liquidnet.service.goblin.service.manage.SmileFrontService;
......@@ -74,22 +75,22 @@ public class SmileFrontServiceImpl implements SmileFrontService {
String sqlDatas = SqlMapping.gets(sqls, sqlData);
queueUtils.sendMsgByRedis(MQConst.SmileQueue.SMILE_USER.getKey(), sqlDatas);
}
/* public void updateUser(SmileUserVO smileUserVO){
public void updateUser(SmileUserVO smileUserVO){
LinkedList<String> sqls = CollectionUtil.linkedListString();
sqls.add(SqlMapping.get("smile_service.update_user"));
LinkedList<Object[]> sqlData = CollectionUtil.linkedListObjectArr();
sqlData.add(new Object[]{
smileUserVO.getImg(),smileUserVO.getName(),smileUserVO.getBirthday(),smileUserVO.getSex(),
smileUserVO.getPhone(),smileUserVO.getProvinceKey(),smileUserVO.getProvince(),smileUserVO.getCityKey(),smileUserVO.getCity(),
smileUserVO.getAreaKey(),smileUserVO.getArea(),smileUserVO.getAddress(),smileUserVO.getWechat(),smileUserVO.getType(),smileUserVO.getOrgId(),
smileUserVO.getPhone(),smileUserVO.getProvinceId(),smileUserVO.getProvince(),smileUserVO.getCityId(),smileUserVO.getCity(),
smileUserVO.getAreaId(),smileUserVO.getArea(),smileUserVO.getAddress(),smileUserVO.getWechat(),smileUserVO.getType(),smileUserVO.getOrgId(),
smileUserVO.getIdCard(),smileUserVO.getSchoolName(),smileUserVO.getSchoolMajor(),smileUserVO.getIdentity(),smileUserVO.getTag(),smileUserVO.getAgent(),
smileUserVO.getAuthTag(),smileUserVO.getErrorReason(),smileUserVO.getIntroduce(),smileUserVO.getSpecialty1(),smileUserVO.getSpecialty2(),
smileUserVO.getErrorReason(),smileUserVO.getIntroduce(),smileUserVO.getSpecialty1(),smileUserVO.getSpecialty2(),
smileUserVO.getSpecialty3(),smileUserVO.getState(),smileUserVO.getUpdatedDate(),smileUserVO.getSchoolId(),smileUserVO.getUid()
});
String sqlDatas = SqlMapping.gets(sqls, sqlData);
queueUtils.sendMsgByRedis(MQConst.SmileQueue.SMILE_USER.getKey(), sqlDatas);
}*/
}
public List<KylinPerformanceVo> getPerformance() {
ArrayList<KylinPerformanceVo> list = ObjectUtil.kylinPerformanceVoList();
......@@ -125,8 +126,15 @@ public class SmileFrontServiceImpl implements SmileFrontService {
}
@Override
public boolean auth(String uid, SmileUserVO redisVo) {
public boolean auth(String uid, SmileUserVO redisVo,boolean b) {
smileRedisUtils.setSmileUserVo(uid,redisVo);
if(b){
insertUser(redisVo);
}else{
redisVo.setUpdatedDate(LocalDateTime.now());
updateUser(redisVo);
}
return true;
}
......@@ -159,6 +167,11 @@ public class SmileFrontServiceImpl implements SmileFrontService {
return smileSellDataDetailVO;
}
@Override
public List<SmileSchoolVo> getSchool(String name) {
return smileMongoUtils.getSchoole(name);
}
public void setUser(SmileUserVO smileUserVO, SmileUserVO redisVo, String type) {
if (type.equals("1")) {
......@@ -196,7 +209,7 @@ public class SmileFrontServiceImpl implements SmileFrontService {
redisVo.setIntroduce(smileUserVO.getIntroduce());
redisVo.setSpecialty1(smileUserVO.getSpecialty1());
redisVo.setSpecialty2(smileUserVO.getSpecialty2());
redisVo.setSpecialty3(smileUserVO.getSpecialty2());
redisVo.setSpecialty3(smileUserVO.getSpecialty3());
redisVo.setUpdatedDate(LocalDateTime.now());
redisVo.setUid(smileUserVO.getUid());
redisVo.setDelTag(0);
......
liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/util/SmileMongoUtils.java
View file @ e327a2f5
package com.liquidnet.service.util;
import com.liquidnet.service.goblin.dto.vo.SmileSchoolVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
......@@ -7,6 +8,8 @@ import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Component;
import java.util.List;
@Component
public class SmileMongoUtils {
@Autowired
......@@ -17,5 +20,12 @@ public class SmileMongoUtils {
KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
}
public List<SmileSchoolVo> getSchoole(String name){
Query query = new Query();
java.util.regex.Pattern pattern =
java.util.regex.Pattern.compile("^.*" + name + ".*$", java.util.regex.Pattern.CASE_INSENSITIVE);
query.addCriteria(Criteria.where("name").regex(pattern));
return mongoTemplate.find(query, SmileSchoolVo.class, SmileSchoolVo.class.getSimpleName());
}
}
liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/resources/sqlmap.properties
View file @ e327a2f5
......@@ -2,7 +2,7 @@
goblin_service_support.insert_byreplace=REPLACE INTO goblin_service_support (ssid,name,`desc`,url,del_flg,created_by,created_at)VALUES(?,?,?,?,'0','-',sysdate())
smile_service.insert_user= insert into smile_user(img,`name`,`uid`,birthday,sex,phone,province_id,province,city_id,city,area_id,area,address,wechat,`type`,org_id,id_card,school_name,school_major,`identity`,tag,agent,error_reason,introduce,specialty1,specialty2,specialty3,`state`,del_tag,created_date,updated_date,school_id) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
smile_service.update_user= update smile_user set img =?,`name`=?,birthday=?,sex =?,phone=?,province_key=?,province=?,city_key =?,city=?,area_key=?,area =?,address =?,wechat =?,`type`=?,org_id =?,id_card=?,school_name =?,school_major =?,`identity`=?,tag =?,agent =?,auth_tag =?,error_reason =?,introduce =?,specialty1 =?,specialty2 =?,specialty3 =?,`state`=?,updated_date=?,school_id=? where `uid`=?
smile_service.update_user= update smile_user set img =?,`name`=?,birthday=?,sex =?,phone=?,province_id=?,province=?,city_id =?,city=?,area_id=?,area =?,address =?,wechat =?,`type`=?,org_id =?,id_card=?,school_name =?,school_major =?,`identity`=?,tag =?,agent =?,error_reason =?,introduce =?,specialty1 =?,specialty2 =?,specialty3 =?,`state`=?,updated_date=?,school_id=? where `uid`=?
smile_service.delete_user= delete from smile_user where uid=?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment