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

Skip to content

L
liquidnet-bus-v1
Commit 22aa19d3 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

Merge branch 'master' into hjc_volunteers_fix_projectList

parents 1e3aabc3 b1c86aae
Hide whitespace changes
Inline Side-by-side
Showing with 196 additions and 40 deletions
liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SmileSchoolVo.java
View file @ 22aa19d3
package com.liquidnet.service.goblin.dto.vo; package com.liquidnet.service.goblin.dto.vo;
import com.liquidnet.service.smile.entity.SmileSchool;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -20,6 +21,8 @@ public class SmileSchoolVo implements Serializable { ...@@ -20,6 +21,8 @@ public class SmileSchoolVo implements Serializable {
private Long id; private Long id;
private String schoolId;
/** /**
* 学校名称 * 学校名称
*/ */
...@@ -69,4 +72,21 @@ public class SmileSchoolVo implements Serializable { ...@@ -69,4 +72,21 @@ public class SmileSchoolVo implements Serializable {
private String area; 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 @ 22aa19d3
package com.liquidnet.service.goblin.service.manage; 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.SmileSellDataDetailVO;
import com.liquidnet.service.goblin.dto.vo.SmileUserVO; import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo; import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
...@@ -11,6 +12,7 @@ public interface SmileFrontService { ...@@ -11,6 +12,7 @@ public interface SmileFrontService {
public boolean saveOrUpdateUser(SmileUserVO smileUserVO,SmileUserVO redisVo,String type); public boolean saveOrUpdateUser(SmileUserVO smileUserVO,SmileUserVO redisVo,String type);
public List<KylinPerformanceVo> getPerformance(); public List<KylinPerformanceVo> getPerformance();
public void deleteUser(String uid); 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 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 @ 22aa19d3
...@@ -6,7 +6,7 @@ liquidnet: ...@@ -6,7 +6,7 @@ liquidnet:
username: user username: user
password: user123 password: user123
eureka: eureka:
host: 127.0.0.1:7001 host: 39.107.71.112:7001
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
spring: spring:
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/userPendingList/detail.html
View file @ 22aa19d3
...@@ -33,6 +33,10 @@ ...@@ -33,6 +33,10 @@
<div class="detail_inner detail_idcode"></div> <div class="detail_inner detail_idcode"></div>
<p class="detail_title">自我介绍</p> <p class="detail_title">自我介绍</p>
<div class="detail_inner detail_desc"></div> <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> <p>手机号：</p>
<div class="detail_inner detail_mobail"></div> <div class="detail_inner detail_mobail"></div>
<!--<p>提交时间：</p>--> <!--<p>提交时间：</p>-->
...@@ -124,6 +128,9 @@ ...@@ -124,6 +128,9 @@
$('.detail_name').text(detailData.name); $('.detail_name').text(detailData.name);
$('.detail_idcode').text(detailData.idCard); $('.detail_idcode').text(detailData.idCard);
$('.detail_desc').text(detailData.introduce); $('.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_mobail').text(detailData.phone);
$('.detail_created').text(detailData.createdDate); $('.detail_created').text(detailData.createdDate);
if (detailData.type != 0) { if (detailData.type != 0) {
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/test/java/com.liquidnet.client.admin/TestLocal.java
View file @ 22aa19d3
package com.liquidnet.client.admin; 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.constant.LnsEnum;
import com.liquidnet.commons.lang.util.CurrentUtil; import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.commons.lang.util.MD5; 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.constant.KylinTableStatusConst;
import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo; import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
import com.liquidnet.service.kylin.entity.KylinOrderRefunds; 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.BasicDBObject;
import com.mongodb.client.result.UpdateResult; import com.mongodb.client.result.UpdateResult;
import org.junit.Test; import org.junit.Test;
...@@ -23,6 +27,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; ...@@ -23,6 +27,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Arrays; import java.util.Arrays;
import java.util.List;
/** /**
* Test * Test
...@@ -69,4 +74,18 @@ public class TestLocal { ...@@ -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)); boolean contains = Arrays.asList(LnsEnum.ENV.dev.name(), LnsEnum.ENV.test.name()).contains(environment.getProperty(CurrentUtil.CK_ENV_ACTIVE));
System.out.println(contains); 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/service/impl/SmileSchoolServiceImpl.java
View file @ 22aa19d3
...@@ -16,10 +16,14 @@ import com.liquidnet.service.smile.entity.SmileUser; ...@@ -16,10 +16,14 @@ import com.liquidnet.service.smile.entity.SmileUser;
import com.liquidnet.service.smile.mapper.SmileSchoolMapper; import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
import com.liquidnet.service.smile.mapper.SmileUserMapper; import com.liquidnet.service.smile.mapper.SmileUserMapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; 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 org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -45,11 +49,14 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile ...@@ -45,11 +49,14 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
@Autowired @Autowired
SmileRedisUtils smileRedisUtils; SmileRedisUtils smileRedisUtils;
@Autowired
MongoTemplate mongoTemplate;
@Override @Override
public PageInfo<SmileSchool> schoolList(SmileSchoolParam smileSchoolParam) { public PageInfo<SmileSchool> schoolList(SmileSchoolParam smileSchoolParam) {
PageInfo<SmileSchool> pageInfo; PageInfo<SmileSchool> pageInfo;
try { try {
Map<String,Object> map = BeanUtil.convertBeanToMap(smileSchoolParam); Map<String, Object> map = BeanUtil.convertBeanToMap(smileSchoolParam);
List<SmileSchool> smileSchools = smileSchoolMapper.selectSchoolList(map); List<SmileSchool> smileSchools = smileSchoolMapper.selectSchoolList(map);
pageInfo = new PageInfo<>(smileSchools); pageInfo = new PageInfo<>(smileSchools);
} catch (Exception e) { } catch (Exception e) {
...@@ -69,27 +76,35 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile ...@@ -69,27 +76,35 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
log.debug("smileSchool:{}", smileSchool); log.debug("smileSchool:{}", smileSchool);
LambdaQueryWrapper<SmileSchool> queryWrapper = Wrappers.lambdaQuery(SmileSchool.class); LambdaQueryWrapper<SmileSchool> queryWrapper = Wrappers.lambdaQuery(SmileSchool.class);
queryWrapper.eq(SmileSchool::getName, smileSchool.getName()); queryWrapper.eq(SmileSchool::getName, smileSchool.getName());
queryWrapper.eq(SmileSchool::getDelTag,0); queryWrapper.eq(SmileSchool::getDelTag, 0);
if (smileSchoolMapper.selectOne(queryWrapper) == null) { if (smileSchoolMapper.selectOne(queryWrapper) == null) {
smileSchoolMapper.insert(smileSchool); smileSchoolMapper.insert(smileSchool);
//保存学校 //保存学校
smileRedisUtils.setSchool(String.valueOf(smileSchool.getId()),smileSchool.getName()); smileRedisUtils.setSchool(String.valueOf(smileSchool.getId()), smileSchool.getName());
updateSchoolRedis(); 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.success();
} }
return AjaxResult.warn("学校已存在"); return AjaxResult.warn("学校已存在");
} }
@Override @Override
public AjaxResult updateSchoolById(SmileSchool smileSchool) { public AjaxResult updateSchoolById(SmileSchool smileSchool) {
LambdaQueryWrapper<SmileSchool> queryWrapper = Wrappers.lambdaQuery(SmileSchool.class); LambdaQueryWrapper<SmileSchool> queryWrapper = Wrappers.lambdaQuery(SmileSchool.class);
queryWrapper.eq(SmileSchool::getId, smileSchool.getId()); queryWrapper.eq(SmileSchool::getId, smileSchool.getId());
queryWrapper.eq(SmileSchool::getDelTag,0); queryWrapper.eq(SmileSchool::getDelTag, 0);
if (smileSchoolMapper.update(smileSchool, queryWrapper) > 0) { if (smileSchoolMapper.update(smileSchool, queryWrapper) > 0) {
//更新User表 根据学校id修改用户学校名称 //更新User表 根据学校id修改用户学校名称
smileUserMapper.updateUserSchoolBySchoolId(smileSchool.getId().toString(), smileSchool.getName()); 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 //更新redis
updateSchoolRedis(); updateSchoolRedis();
return AjaxResult.success(); return AjaxResult.success();
...@@ -101,14 +116,17 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile ...@@ -101,14 +116,17 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
public AjaxResult del(Long id) { public AjaxResult del(Long id) {
//查询是否有用户使用过该学校 //查询是否有用户使用过该学校
LambdaQueryWrapper<SmileUser> queryWrapper = Wrappers.lambdaQuery(SmileUser.class); LambdaQueryWrapper<SmileUser> queryWrapper = Wrappers.lambdaQuery(SmileUser.class);
queryWrapper.eq(SmileUser::getSchoolId,id); queryWrapper.eq(SmileUser::getSchoolId, id);
queryWrapper.eq(SmileUser::getDelTag,0); queryWrapper.eq(SmileUser::getDelTag, 0);
List<SmileUser> smileUsers = smileUserMapper.selectList(queryWrapper); List<SmileUser> smileUsers = smileUserMapper.selectList(queryWrapper);
if (smileUsers.size() > 0){ if (smileUsers.size() > 0) {
return AjaxResult.warn("该学校已被使用，不可删除"); return AjaxResult.warn("该学校已被使用，不可删除");
} }
//学校没有被使用 可以删除 //学校没有被使用 可以删除
smileSchoolMapper.updateDel(id); 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)); smileRedisUtils.delSchool(String.valueOf(id));
updateSchoolRedis(); updateSchoolRedis();
return AjaxResult.success(); return AjaxResult.success();
...@@ -118,15 +136,40 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile ...@@ -118,15 +136,40 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
private void updateSchoolRedis() { private void updateSchoolRedis() {
List<SmileSchoolVo> smileSchoolVos = new ArrayList<>(); List<SmileSchoolVo> smileSchoolVos = new ArrayList<>();
smileSchoolMapper.selectListLimit().forEach(smileSchool -> { smileSchoolMapper.selectListLimit().forEach(smileSchool -> {
SmileSchoolVo smileSchoolVo = new SmileSchoolVo(); SmileSchoolVo smileSchoolVo = new SmileSchoolVo().copy(smileSchool);
smileSchoolVos.add(smileSchoolVo);
});
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 { try {
BeanUtils.copyProperties(smileSchool,smileSchoolVo); mongoTemplate.insert(smileSchoolVo, SmileSchoolVo.class.getSimpleName());
smileSchoolVos.add(smileSchoolVo); } catch (Exception e) {
}catch (Exception e) { log.debug("数据存在：{}", smileSchoolVo);
e.printStackTrace();
} }
}); });
smileRedisUtils.setSchoolAll(smileSchoolVos); }
/**
* 跟新redis中学校SmileSchoolVo类：dev_kids0609初始化
*/
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/utils/SmileRedisUtils.java
View file @ 22aa19d3
...@@ -58,6 +58,13 @@ public class SmileRedisUtils { ...@@ -58,6 +58,13 @@ public class SmileRedisUtils {
return (String) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId)); 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 { ...@@ -72,6 +79,20 @@ public class SmileRedisUtils {
redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_SCHOOL, smileSchoolVos); 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 @ 22aa19d3
...@@ -34,7 +34,7 @@ public final class RedisUtil extends AbstractRedisUtil{ ...@@ -34,7 +34,7 @@ public final class RedisUtil extends AbstractRedisUtil{
public static void main(String[] args) { public static void main(String[] args) {
String[] keys = { String[] keys = {
"smile:show", "smile:school",
}; };
for (String key : keys) { for (String key : keys) {
long value = key.hashCode(); long value = key.hashCode();
......
liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileSchoolMapper.xml
View file @ 22aa19d3
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<mapper namespace="com.liquidnet.service.smile.mapper.SmileSchoolMapper"> <mapper namespace="com.liquidnet.service.smile.mapper.SmileSchoolMapper">
<select id="selectListLimit" resultType="com.liquidnet.service.smile.entity.SmileSchool"> <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>
<select id="selectSchoolList" parameterType="java.util.Map" resultType="com.liquidnet.service.smile.entity.SmileSchool"> <select id="selectSchoolList" parameterType="java.util.Map" resultType="com.liquidnet.service.smile.entity.SmileSchool">
......
liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/docu/db_ln_goblin_initialdata.sql
View file @ 22aa19d3
...@@ -39,7 +39,7 @@ CREATE TABLE `smile_user` ( ...@@ -39,7 +39,7 @@ CREATE TABLE `smile_user` (
`id_card` varchar(18) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '身份证号', `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_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_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已毕业）', `identity` int NULL DEFAULT NULL COMMENT '身份（1:在校学生（默认），2已毕业）',
`tag` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '标识步骤', `tag` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '标识步骤',
`agent` int NULL DEFAULT NULL COMMENT '1：代理开启，2：代理关闭', `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 @ 22aa19d3
...@@ -2,10 +2,13 @@ use test_ln_scene; ...@@ -2,10 +2,13 @@ use test_ln_scene;
// ================================================== 创建集合 // ================================================== 创建集合
db.createCollection("SmileSellDataDetailVO"); db.createCollection("SmileSellDataDetailVO");
db.createCollection("SmileSellDataVO"); db.createCollection("SmileSellDataVO");
db.createCollection("SmileSchoolVo");
// ================================================== 创建索引 // ================================================== 创建索引
db.SmileSellDataDetailVO.createIndex({dataId:"hashed"}); db.SmileSellDataDetailVO.createIndex({dataId:"hashed"});
db.SmileSellDataVO.createIndex({sellDataId:"hashed"}); db.SmileSellDataVO.createIndex({sellDataId:"hashed"});
db.SmileSchoolVo.createIndex({schoolId:"hashed"})
================================================== 创建分片 ================================================== 创建分片
sh.enableSharding("test_ln_scene"); sh.enableSharding("test_ln_scene");
sh.shardCollection("test_ln_scene.SmileSellDataDetailVO",{"dataId":"hashed"}); sh.shardCollection("test_ln_scene.SmileSellDataDetailVO",{"dataId":"hashed"});
sh.shardCollection("test_ln_scene.SmileSellDataVO",{"sellDataId":"hashed"}); sh.shardCollection("test_ln_scene.SmileSellDataVO",{"sellDataId":"hashed"});
\ No newline at end of file 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 @ 22aa19d3
...@@ -46,13 +46,21 @@ public class SmileUserController { ...@@ -46,13 +46,21 @@ public class SmileUserController {
} }
@GetMapping("getSchool") @GetMapping("getSchool")
@ApiOperation("获得学校") @ApiOperation("获得学校")
public ResponseDto<List<SmileSchoolVo>> getSchool() { public ResponseDto<List<SmileSchoolVo>> getSchool(String name) {
/* String userId = CurrentUtil.getCurrentUid(); /* String userId = CurrentUtil.getCurrentUid();
List<SmileSchoolVo> list=null; List<SmileSchoolVo> list=null;
if(redisUtil.hasKey(SmileRedisConst.SMILE_SCHOOL)){ if(redisUtil.hasKey(SmileRedisConst.SMILE_SCHOOL)){
list= (List<SmileSchoolVo>) redisUtil.get(SmileRedisConst.SMILE_SCHOOL); list= (List<SmileSchoolVo>) redisUtil.get(SmileRedisConst.SMILE_SCHOOL);
}*/ }*/
return ResponseDto.success(smileRedisUtils.getSchool()); if(StringUtil.isNotBlank(name)){
//mongodb 搜索
return ResponseDto.success(smileFrontService.getSchool(name));
}else{
return ResponseDto.success(smileRedisUtils.getSchool());
}
} }
@GetMapping("getPerformance") @GetMapping("getPerformance")
@ApiOperation("获得演出列表") @ApiOperation("获得演出列表")
...@@ -97,14 +105,19 @@ public class SmileUserController { ...@@ -97,14 +105,19 @@ public class SmileUserController {
if(!(smileUserVORedis.getTag().contains("1")&&smileUserVORedis.getTag().contains("2")&&smileUserVORedis.getTag().contains("3"))){ if(!(smileUserVORedis.getTag().contains("1")&&smileUserVORedis.getTag().contains("2")&&smileUserVORedis.getTag().contains("3"))){
return ResponseDto.failure("用户信息不全，请填写后提交认证"); return ResponseDto.failure("用户信息不全，请填写后提交认证");
} }
//smileRedisUtils.setSmileUserVo(userId,smileUserVORedis);
if(null!=smileUserVORedis.getType()&&smileUserVORedis.getType()==4){ if(null!=smileUserVORedis.getType()&&smileUserVORedis.getType()==4){
smileFrontService.deleteUser(userId); /*smileFrontService.deleteUser(userId);*/
smileUserVORedis.setAuthStatus(1);
smileUserVORedis.setType(0);
smileFrontService.auth(userId,smileUserVORedis,false);
}else{
smileUserVORedis.setAuthStatus(1);
smileUserVORedis.setType(0);
smileFrontService.auth(userId,smileUserVORedis,true);
} }
smileUserVORedis.setAuthStatus(1);
smileUserVORedis.setType(0);
smileRedisUtils.setSmileUserVo(userId,smileUserVORedis);
//redisUtil.set(SmileRedisConst.SMILE_USER.concat(userId),smileUserVORedis); //redisUtil.set(SmileRedisConst.SMILE_USER.concat(userId),smileUserVORedis);
return ResponseDto.success(smileFrontService.auth(userId,smileUserVORedis)); return ResponseDto.success();
} }
} }
return ResponseDto.failure("没有该用户信息"); return ResponseDto.failure("没有该用户信息");
...@@ -147,6 +160,7 @@ public class SmileUserController { ...@@ -147,6 +160,7 @@ public class SmileUserController {
} }
if(StringUtil.isNotBlank(smileUserVO.getIdCard())&&StringUtil.isNotBlank(smileUserVO.getName())){ if(StringUtil.isNotBlank(smileUserVO.getIdCard())&&StringUtil.isNotBlank(smileUserVO.getName())){
String userId = CurrentUtil.getCurrentUid(); String userId = CurrentUtil.getCurrentUid();
/* String status=smileRedisUtils.getValidate(smileUserVO.getName(), smileUserVO.getIdCard());*/
if(utils.validate(smileUserVO.getName(),smileUserVO.getIdCard())){ if(utils.validate(smileUserVO.getName(),smileUserVO.getIdCard())){
smileUserVO.setUid(userId); smileUserVO.setUid(userId);
SmileUserVO smileUserVORedis=smileRedisUtils.getSmileUserVo(userId); SmileUserVO smileUserVORedis=smileRedisUtils.getSmileUserVo(userId);
...@@ -155,6 +169,10 @@ public class SmileUserController { ...@@ -155,6 +169,10 @@ public class SmileUserController {
return ResponseDto.failure("用户状态不对"); return ResponseDto.failure("用户状态不对");
} }
smileUserVO.setTag("2"); smileUserVO.setTag("2");
//查看这个身份证有没有被用过
/* if(StringUtil.isNotBlank(status)){
return ResponseDto.failure("该身份证已经有账号绑定了！");
}*/
smileFrontService.saveOrUpdateUser(smileUserVO,smileUserVORedis,"2"); smileFrontService.saveOrUpdateUser(smileUserVO,smileUserVORedis,"2");
}else { }else {
return ResponseDto.failure("验证身份证失败！"); 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 @ 22aa19d3
...@@ -3,6 +3,7 @@ package com.liquidnet.service.service.impl; ...@@ -3,6 +3,7 @@ package com.liquidnet.service.service.impl;
import com.liquidnet.commons.lang.util.CollectionUtil; import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.service.base.SqlMapping; import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.base.constant.MQConst; 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.SmileSellDataDetailVO;
import com.liquidnet.service.goblin.dto.vo.SmileUserVO; import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
import com.liquidnet.service.goblin.service.manage.SmileFrontService; import com.liquidnet.service.goblin.service.manage.SmileFrontService;
...@@ -74,22 +75,22 @@ public class SmileFrontServiceImpl implements SmileFrontService { ...@@ -74,22 +75,22 @@ public class SmileFrontServiceImpl implements SmileFrontService {
String sqlDatas = SqlMapping.gets(sqls, sqlData); String sqlDatas = SqlMapping.gets(sqls, sqlData);
queueUtils.sendMsgByRedis(MQConst.SmileQueue.SMILE_USER.getKey(), sqlDatas); queueUtils.sendMsgByRedis(MQConst.SmileQueue.SMILE_USER.getKey(), sqlDatas);
} }
/* public void updateUser(SmileUserVO smileUserVO){ public void updateUser(SmileUserVO smileUserVO){
LinkedList<String> sqls = CollectionUtil.linkedListString(); LinkedList<String> sqls = CollectionUtil.linkedListString();
sqls.add(SqlMapping.get("smile_service.update_user")); sqls.add(SqlMapping.get("smile_service.update_user"));
LinkedList<Object[]> sqlData = CollectionUtil.linkedListObjectArr(); LinkedList<Object[]> sqlData = CollectionUtil.linkedListObjectArr();
sqlData.add(new Object[]{ sqlData.add(new Object[]{
smileUserVO.getImg(),smileUserVO.getName(),smileUserVO.getBirthday(),smileUserVO.getSex(), smileUserVO.getImg(),smileUserVO.getName(),smileUserVO.getBirthday(),smileUserVO.getSex(),
smileUserVO.getPhone(),smileUserVO.getProvinceKey(),smileUserVO.getProvince(),smileUserVO.getCityKey(),smileUserVO.getCity(), smileUserVO.getPhone(),smileUserVO.getProvinceId(),smileUserVO.getProvince(),smileUserVO.getCityId(),smileUserVO.getCity(),
smileUserVO.getAreaKey(),smileUserVO.getArea(),smileUserVO.getAddress(),smileUserVO.getWechat(),smileUserVO.getType(),smileUserVO.getOrgId(), 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.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() smileUserVO.getSpecialty3(),smileUserVO.getState(),smileUserVO.getUpdatedDate(),smileUserVO.getSchoolId(),smileUserVO.getUid()
}); });
String sqlDatas = SqlMapping.gets(sqls, sqlData); String sqlDatas = SqlMapping.gets(sqls, sqlData);
queueUtils.sendMsgByRedis(MQConst.SmileQueue.SMILE_USER.getKey(), sqlDatas); queueUtils.sendMsgByRedis(MQConst.SmileQueue.SMILE_USER.getKey(), sqlDatas);
}*/ }
public List<KylinPerformanceVo> getPerformance() { public List<KylinPerformanceVo> getPerformance() {
ArrayList<KylinPerformanceVo> list = ObjectUtil.kylinPerformanceVoList(); ArrayList<KylinPerformanceVo> list = ObjectUtil.kylinPerformanceVoList();
...@@ -125,8 +126,15 @@ public class SmileFrontServiceImpl implements SmileFrontService { ...@@ -125,8 +126,15 @@ public class SmileFrontServiceImpl implements SmileFrontService {
} }
@Override @Override
public boolean auth(String uid, SmileUserVO redisVo) { public boolean auth(String uid, SmileUserVO redisVo,boolean b) {
insertUser(redisVo); smileRedisUtils.setSmileUserVo(uid,redisVo);
if(b){
insertUser(redisVo);
}else{
redisVo.setUpdatedDate(LocalDateTime.now());
updateUser(redisVo);
}
return true; return true;
} }
...@@ -159,6 +167,11 @@ public class SmileFrontServiceImpl implements SmileFrontService { ...@@ -159,6 +167,11 @@ public class SmileFrontServiceImpl implements SmileFrontService {
return smileSellDataDetailVO; return smileSellDataDetailVO;
} }
@Override
public List<SmileSchoolVo> getSchool(String name) {
return smileMongoUtils.getSchoole(name);
}
public void setUser(SmileUserVO smileUserVO, SmileUserVO redisVo, String type) { public void setUser(SmileUserVO smileUserVO, SmileUserVO redisVo, String type) {
if (type.equals("1")) { if (type.equals("1")) {
...@@ -196,7 +209,7 @@ public class SmileFrontServiceImpl implements SmileFrontService { ...@@ -196,7 +209,7 @@ public class SmileFrontServiceImpl implements SmileFrontService {
redisVo.setIntroduce(smileUserVO.getIntroduce()); redisVo.setIntroduce(smileUserVO.getIntroduce());
redisVo.setSpecialty1(smileUserVO.getSpecialty1()); redisVo.setSpecialty1(smileUserVO.getSpecialty1());
redisVo.setSpecialty2(smileUserVO.getSpecialty2()); redisVo.setSpecialty2(smileUserVO.getSpecialty2());
redisVo.setSpecialty3(smileUserVO.getSpecialty2()); redisVo.setSpecialty3(smileUserVO.getSpecialty3());
redisVo.setUpdatedDate(LocalDateTime.now()); redisVo.setUpdatedDate(LocalDateTime.now());
redisVo.setUid(smileUserVO.getUid()); redisVo.setUid(smileUserVO.getUid());
redisVo.setDelTag(0); redisVo.setDelTag(0);
......
liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/util/SmileMongoUtils.java
View file @ 22aa19d3
package com.liquidnet.service.util; package com.liquidnet.service.util;
import com.liquidnet.service.goblin.dto.vo.SmileSchoolVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo; import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.MongoTemplate;
...@@ -7,6 +8,8 @@ import org.springframework.data.mongodb.core.query.Criteria; ...@@ -7,6 +8,8 @@ import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List;
@Component @Component
public class SmileMongoUtils { public class SmileMongoUtils {
@Autowired @Autowired
...@@ -17,5 +20,12 @@ public class SmileMongoUtils { ...@@ -17,5 +20,12 @@ public class SmileMongoUtils {
KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName()); 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 @ 22aa19d3
...@@ -2,7 +2,7 @@ ...@@ -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()) 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.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=? 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