hyy-alt 4 years ago
parent
commit
d8a18d5914
  1. 4
      cloudutil/src/main/resources/application-util-greenvalley.yml
  2. 3
      game/src/main/resources/application-prod.yml
  3. 4
      game/src/main/resources/application.yml
  4. 4
      ht/src/main/resources/application.yml
  5. 30
      mt/src/main/java/com/ccsens/mt/api/ExcelController.java
  6. 10
      mt/src/main/java/com/ccsens/mt/bean/vo/CompeteExcelVo.java
  7. 9
      mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java
  8. 8
      mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java
  9. 6
      mt/src/main/java/com/ccsens/mt/service/ExcelService.java
  10. 3
      mt/src/main/java/com/ccsens/mt/service/IExcelService.java
  11. 14
      mt/src/main/java/com/ccsens/mt/service/IImportService.java
  12. 274
      mt/src/main/java/com/ccsens/mt/service/ImportService.java
  13. 2
      mt/src/main/java/com/ccsens/mt/service/ProvinceService.java
  14. 10
      mt/src/main/resources/application-prod.yml
  15. 4
      mt/src/main/resources/application.yml
  16. 6
      mt/src/main/resources/druid-prod.yml
  17. 24
      mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml
  18. 11
      mt/src/main/resources/mapper_dao/CompetePlayerDao.xml
  19. 49
      mt/src/main/resources/mapper_dao/CompeteProjectDao.xml
  20. 9
      recovery/src/main/java/com/ccsens/recovery/service/PatientService.java
  21. 24
      tall/src/main/java/com/ccsens/tall/rabbitMQ/MessageTest.java
  22. 16
      tall/src/main/java/com/ccsens/tall/service/ProjectService.java
  23. 2
      tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java
  24. 2
      tall/src/main/resources/application-greenvalley.yml
  25. 1
      tall/src/main/resources/druid-greenvalley.yml
  26. 32
      util/src/test/java/com/ccsens/util/VideoTest.java
  27. 16
      wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java
  28. 4
      wisdomcar/src/main/resources/application.yml

4
cloudutil/src/main/resources/application-util-greenvalley.yml

@ -19,8 +19,8 @@ eureka:
client:
service-url:
# 指定eureka server通信地址,注意/eureka/小尾巴不能少
# defaultZone: http://admin:admin@82.156.116.247:7010/eureka/
defaultZone: http://admin:admin@49.232.6.143:7010/eureka/
defaultZone: http://admin:admin@82.157.24.76:7010/eureka/
# defaultZone: http://admin:admin@49.232.6.143:7010/eureka/
instance:
# 是否注册IP到eureka server,如不指定或设为false,那就回注册主机名到eureka server
prefer-ip-address: true

3
game/src/main/resources/application-prod.yml

@ -32,7 +32,8 @@ swagger:
enable: true
eureka:
instance:
ip-address: 119.3.214.36
# ip-address: 119.3.214.36
ip-address: 121.36.106.168
gatewayUrl: https://www.tall.wiki/gateway/
notGatewayUrl: https://www.tall.wiki/

4
game/src/main/resources/application.yml

@ -1,4 +1,4 @@
spring:
profiles:
active: dev
include: common, util-dev
active: prod
include: common, util-prod

4
ht/src/main/resources/application.yml

@ -1,4 +1,4 @@
spring:
profiles:
active: prod
include: common, util-prod
active: dev
include: common, util-dev

30
mt/src/main/java/com/ccsens/mt/api/ExcelController.java

@ -2,12 +2,18 @@ package com.ccsens.mt.api;
import com.ccsens.cloudutil.annotation.MustLogin;
import com.ccsens.cloudutil.bean.tall.vo.ProjectVo;
import com.ccsens.mt.bean.dto.CompeteDto;
import com.ccsens.mt.bean.dto.ProvinceCompeteDto;
import com.ccsens.mt.bean.dto.ScoreDto;
import com.ccsens.mt.bean.vo.CompeteExcelVo;
import com.ccsens.mt.bean.vo.TableVo;
import com.ccsens.mt.service.IExcelService;
import com.ccsens.mt.service.IImportService;
import com.ccsens.util.JsonResponse;
import com.ccsens.util.NotSupportedFileTypeException;
import com.ccsens.util.UploadFileUtil_Servlet3;
import com.ccsens.util.WebConstant;
import com.ccsens.util.bean.dto.QueryDto;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
@ -15,12 +21,11 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.Part;
import java.io.File;
import java.io.IOException;
import java.util.List;
@ -34,6 +39,9 @@ import java.util.List;
public class ExcelController {
@Resource
private IExcelService excelService;
@Resource
private IImportService importService;
@MustLogin
@ApiOperation(value = "比赛前八名(导出)", notes = "whj")
@ -159,4 +167,18 @@ public class ExcelController {
String path = excelService.countExpTable(params.getParam());
return JsonResponse.newInstance().ok(path);
}
@ApiOperation(value = "导入总决赛名单表", notes = "各个分赛场选出前三名,统计后导入系统生成总决赛名单")
@RequestMapping(value = "/importFinal", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<List<CompeteExcelVo.ErrorPlayer>> importFinal(@RequestParam(required = true) Part file) throws Exception {
//1.上传文件
String allowedExts = "xls,xlsx";
String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator;
String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExts, dir);
log.info(dir+""+path);
//导入数据库
log.info("导入总决赛名单表");
List<CompeteExcelVo.ErrorPlayer> errorPlayers = importService.importFinal(dir+""+path);
return JsonResponse.newInstance().ok(errorPlayers);
}
}

10
mt/src/main/java/com/ccsens/mt/bean/vo/CompeteExcelVo.java

@ -92,4 +92,14 @@ public class CompeteExcelVo {
private List<TeamOrderPlayer> projectList;
}
@Data
@ApiModel("导入总决赛表异常")
public static class ErrorPlayer{
@ApiModelProperty("sheet名")
private String sheetName;
@ApiModelProperty("行")
private int rowNum;
@ApiModelProperty("异常原因")
private String remark;
}
}

9
mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java

@ -162,4 +162,13 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper {
List<TableVo.CompeteOverview> selectCompeteJoinCountList(@Param("competeTimeId")Long competeTimeId);
/**
* 根据单位名和类型查找参赛单位信息筛选出有用的一条
* @param companyCell 单位名称
* @param playerName 参赛人员名称
* @param projectCell 项目名称
* @param type 比赛类型
* @return 报名单位信息
*/
List<CompeteCompany> getCompanyByNameAndType(@Param("companyName") String companyCell,@Param("playerName") String playerName,@Param("projectName") String projectCell,@Param("type") int type);
}

8
mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java

@ -106,4 +106,12 @@ public interface CompetePlayerDao extends CompetePlayerMapper {
* @return
*/
List<TableVo.CompeteAllCount1> getJoinRuleTeamNumByType(@Param("type")byte type);
/**
* 根据团队id和名字查找选手信息
* @param playerCell 选手姓名
* @param id 团队id
* @return 选手信息
*/
List<CompetePlayer> getPlayerByNameAndCompany(@Param("name") String playerCell,@Param("id") Long id);
}

6
mt/src/main/java/com/ccsens/mt/service/ExcelService.java

@ -30,10 +30,8 @@ import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import javax.servlet.http.Part;
import java.io.*;
import java.text.SimpleDateFormat;
import java.util.ArrayList;

3
mt/src/main/java/com/ccsens/mt/service/IExcelService.java

@ -3,10 +3,12 @@ package com.ccsens.mt.service;
import com.ccsens.mt.bean.dto.ProvinceCompeteDto;
import com.ccsens.mt.bean.dto.ScoreDto;
import com.ccsens.mt.bean.dto.CompeteDto;
import com.ccsens.mt.bean.vo.CompeteExcelVo;
import com.ccsens.mt.bean.vo.TableVo;
import com.ccsens.util.bean.dto.QueryDto;
import com.github.pagehelper.PageInfo;
import javax.servlet.http.Part;
import java.io.IOException;
import java.util.List;
@ -106,4 +108,5 @@ public interface IExcelService {
String countExpTable(ScoreDto.ShowResultNoPage param);
}

14
mt/src/main/java/com/ccsens/mt/service/IImportService.java

@ -0,0 +1,14 @@
package com.ccsens.mt.service;
import com.ccsens.mt.bean.vo.CompeteExcelVo;
import java.util.List;
public interface IImportService {
/**
* 导入总决赛人员表
* @param path 总决赛表
* @return 返回失败的信息
*/
List<CompeteExcelVo.ErrorPlayer> importFinal(String path) throws Exception;
}

274
mt/src/main/java/com/ccsens/mt/service/ImportService.java

@ -0,0 +1,274 @@
package com.ccsens.mt.service;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.ccsens.mt.bean.po.*;
import com.ccsens.mt.bean.vo.CompeteExcelVo;
import com.ccsens.mt.persist.dao.CompeteCompanyDao;
import com.ccsens.mt.persist.dao.CompetePlayerDao;
import com.ccsens.mt.persist.dao.CompeteProjectDao;
import com.ccsens.mt.persist.dao.CompeteTeamDao;
import com.ccsens.mt.persist.mapper.CompeteCoachMapper;
import com.ccsens.mt.persist.mapper.CompeteGroupMapper;
import com.ccsens.mt.persist.mapper.CompeteProjectPlayerMapper;
import com.ccsens.mt.persist.mapper.CompeteTeamMemberMapper;
import com.ccsens.util.ExcelUtil;
import com.ccsens.util.StringUtil;
import com.ccsens.util.exception.BaseException;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author
*/
@Slf4j
@Service
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public class ImportService implements IImportService{
@Resource
private CompeteCompanyDao competeCompanyDao;
@Resource
private Snowflake snowflake;
@Resource
private CompetePlayerDao competePlayerDao;
@Resource
private CompeteProjectDao competeProjectDao;
@Resource
private CompeteGroupMapper groupMapper;
@Resource
private CompeteProjectPlayerMapper projectPlayerMapper;
@Resource
private CompeteTeamDao teamDao;
@Resource
private CompeteTeamMemberMapper teamMemberMapper;
@Resource
private CompeteCoachMapper coachMapper;
@Override
public List<CompeteExcelVo.ErrorPlayer> importFinal(String path) throws Exception{
List<CompeteExcelVo.ErrorPlayer> errorPlayers = new ArrayList<>();
//获取excel表格
InputStream is = new FileInputStream(path);
XSSFWorkbook wb = new XSSFWorkbook(is);
//获取每个sheet信息
for (int i = 0; i < wb.getNumberOfSheets(); i++) {
int type = 7;
XSSFSheet sheet = wb.getSheetAt(i);
if(ObjectUtil.isNotNull(sheet)) {
String sheetName = sheet.getSheetName();
if (StrUtil.isNotBlank(sheetName)) {
if ("运城站入围名单".equals(sheetName)) {
type = 5;
} else if ("临汾站入围名单".equals(sheetName)) {
type = 4;
} else if ("太原站入围名单".equals(sheetName)) {
type = 6;
}
}
//读取sheet内的信息
readSheet(sheet,type,errorPlayers);
}
}
return errorPlayers;
}
private void readSheet(XSSFSheet sheet, int type, List<CompeteExcelVo.ErrorPlayer> errorPlayers) {
Map<String, CompeteCompany> companyMap = new HashMap<>();
Map<String, CompetePlayer> playerMap = new HashMap<>();
Map<String, CompeteProject> projectMap = new HashMap<>();
Map<String, CompeteGroup> groupMap = new HashMap<>();
Map<String, Long> oldCompanyMap = new HashMap<>();
//查找比赛项目的projectMap
CompeteProjectExample projectExample = new CompeteProjectExample();
projectExample.createCriteria().andTypeEqualTo((byte)7);
List<CompeteProject> competeProjects = competeProjectDao.selectByExample(projectExample);
if (CollectionUtil.isNotEmpty(competeProjects)){
for (CompeteProject competeProject : competeProjects) {
projectMap.put(competeProject.getName(),competeProject);
}
}
//查找比赛组的groupMap
CompeteGroupExample groupExample = new CompeteGroupExample();
groupExample.createCriteria().andTypeEqualTo((byte)7);
List<CompeteGroup> competeGroups = groupMapper.selectByExample(groupExample);
if (CollectionUtil.isNotEmpty(competeGroups)){
for (CompeteGroup competeGroup : competeGroups) {
groupMap.put(competeGroup.getGroupName(),competeGroup);
}
}
for (int i = 1; i <= sheet.getLastRowNum(); i++) {
//参赛单位
String companyCell = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(sheet.getRow(i).getCell(0)));
//参赛项目
String projectCell = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(sheet.getRow(i).getCell(1)));
//组别
String groupCell = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(sheet.getRow(i).getCell(2)));
//选手姓名
String playerCell = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(sheet.getRow(i).getCell(3)));
//查找参赛单位 项目名字(projectCell)没有用来查询
if (!companyMap.containsKey(companyCell)){
String[] playerNames = playerCell.split("、");
List<CompeteCompany> company = competeCompanyDao.getCompanyByNameAndType(companyCell,playerNames[0],projectCell,type);
if (CollectionUtil.isNotEmpty(company)){
oldCompanyMap.put(companyCell,company.get(0).getId());
//查看是该单位是否已经进决赛
List<CompeteCompany> companyByNameAndType = competeCompanyDao.getCompanyByNameAndType(companyCell, playerCell, projectCell, 7);
if (CollectionUtil.isEmpty(companyByNameAndType)){
//复制参赛单位到决赛
CompeteCompany newCompany = new CompeteCompany();
BeanUtil.copyProperties(company.get(0),newCompany);
newCompany.setId(snowflake.nextId());
newCompany.setType((byte)7);
newCompany.setCompeteTimeId(7L);
competeCompanyDao.insertSelective(newCompany);
companyMap.put(companyCell,newCompany);
//复制教练
CompeteCoachExample coachExample = new CompeteCoachExample();
coachExample.createCriteria().andCompanyIdEqualTo(company.get(0).getId());
List<CompeteCoach> competeCoaches = coachMapper.selectByExample(coachExample);
if (CollectionUtil.isNotEmpty(competeCoaches)){
for (CompeteCoach competeCoach : competeCoaches) {
CompeteCoach newCoach = new CompeteCoach();
BeanUtil.copyProperties(competeCoach,newCoach);
newCoach.setId(snowflake.nextId());
newCoach.setCompanyId(newCompany.getId());
newCoach.setCreatedAt(null);
newCoach.setUpdatedAt(null);
coachMapper.insertSelective(newCoach);
}
}
}
}else{
CompeteExcelVo.ErrorPlayer errorPlayer = new CompeteExcelVo.ErrorPlayer();
errorPlayer.setSheetName(companyCell);
errorPlayer.setRowNum(i);
errorPlayer.setRemark("未查找原参赛单位");
errorPlayers.add(errorPlayer);
log.info("报错相关信息学:{}",errorPlayer);
throw new BaseException("未查找原参赛单位:"+i+"行"+"信息"+companyCell);
}
}
//添加比赛成员
if (StrUtil.isNotBlank(playerCell)){
String[] playerNames = playerCell.split("、");
for (String playerName : playerNames) {
if (!playerMap.containsKey(playerName)){
List<CompeteCompany> company = competeCompanyDao.getCompanyByNameAndType(companyCell,playerName,projectCell,type);
if (CollectionUtil.isNotEmpty(company)){
//查找旧的成员信息
List<CompetePlayer> playerList = competePlayerDao.getPlayerByNameAndCompany(playerName,oldCompanyMap.get(companyCell));
if (CollectionUtil.isNotEmpty(playerList)){
CompetePlayer newPlayer = new CompetePlayer();
BeanUtil.copyProperties(playerList.get(0),newPlayer);
newPlayer.setId(snowflake.nextId());
newPlayer.setCompanyId(companyMap.get(companyCell).getId());
newPlayer.setCreatedAt(null);
newPlayer.setUpdatedAt(null);
// newPlayer.setCompeteGroupId(groupMap.get(groupCell).getId());
competePlayerDao.insertSelective(newPlayer);
playerMap.put(playerName,newPlayer);
}else{
CompeteExcelVo.ErrorPlayer errorPlayer = new CompeteExcelVo.ErrorPlayer();
errorPlayer.setSheetName(playerName);
errorPlayer.setRowNum(i);
errorPlayer.setRemark("未找到该比赛成员信息");
errorPlayers.add(errorPlayer);
log.info("报错相关信息学:{}",errorPlayer);
throw new BaseException("未找到该比赛成员信息:"+i+"行"+"信息"+playerName);
}
}
}
}
}
CompeteProject project = projectMap.get(projectCell);
if (ObjectUtil.isNotNull(project)){
if(i == 276 || i == 277 || i == 207){
System.out.println(playerCell);
}
log.info("第{}行",i);
//个人项目
if (0 == project.getTeam()){
CompeteProjectPlayer projectPlayer = new CompeteProjectPlayer();
projectPlayer.setId(snowflake.nextId());
projectPlayer.setPlayerId(playerMap.get(playerCell).getId());
projectPlayer.setProjectId(projectMap.get(projectCell).getId());
projectPlayer.setCompeteGroupId(groupMap.get(groupCell).getId());
projectPlayer.setCompeteTimeId(7L);
projectPlayerMapper.insertSelective(projectPlayer);
}
//团队项目
if (1 == project.getTeam()){
if (groupCell.contains("男子") || groupCell.contains("女子") || groupCell.contains("混合")){
CompeteTeam newTeam = new CompeteTeam();
newTeam.setId(snowflake.nextId());
newTeam.setProjectId(projectMap.get(projectCell).getId());
newTeam.setCompeteTimeId(7L);
newTeam.setGenderGroup(groupMap.get(groupCell).getSex());
newTeam.setCompeteGroupId(groupMap.get(groupCell).getId());
newTeam.setGroupRemark(groupMap.get(groupCell).getGroupRemark());
newTeam.setCompanyId(companyMap.get(companyCell).getId());
teamDao.insertSelective(newTeam);
if (StrUtil.isNotBlank(playerCell)){
String[] playNames = playerCell.split("、");
for (String playName : playNames) {
CompeteTeamMember teamMember = new CompeteTeamMember();
teamMember.setId(snowflake.nextId());
teamMember.setPlayerId(playerMap.get(playName).getId());
teamMember.setCompeteTeamId(newTeam.getId());
teamMemberMapper.insertSelective(teamMember);
}
}
}
if (groupCell.contains("不限")){
CompeteTeam newTeam = new CompeteTeam();
newTeam.setId(snowflake.nextId());
newTeam.setProjectId(projectMap.get(projectCell).getId());
newTeam.setCompeteTimeId(7L);
//TODO 性别 组别id 组别描述 暂时使用默认值
newTeam.setCompanyId(companyMap.get(companyCell).getId());
teamDao.insertSelective(newTeam);
if (StrUtil.isNotBlank(playerCell)){
String[] playNames = playerCell.split("、");
for (String playName : playNames) {
CompeteTeamMember teamMember = new CompeteTeamMember();
teamMember.setId(snowflake.nextId());
teamMember.setPlayerId(playerMap.get(playName).getId());
teamMember.setCompeteTeamId(newTeam.getId());
teamMemberMapper.insertSelective(teamMember);
}
}
}
}
}else{
CompeteExcelVo.ErrorPlayer errorPlayer = new CompeteExcelVo.ErrorPlayer();
errorPlayer.setSheetName(projectCell);
errorPlayer.setRowNum(i);
errorPlayer.setRemark("未查找到该比赛项目");
errorPlayers.add(errorPlayer);
log.info("报错相关信息学:{}",errorPlayer);
throw new BaseException("未查找比赛项目:"+i+"行"+"信息"+projectCell);
}
}
}
}

2
mt/src/main/java/com/ccsens/mt/service/ProvinceService.java

@ -249,6 +249,8 @@ public class ProvinceService implements IProvinceService {
if(ageByIdCard < competeGroup.getMinAge() || ageByIdCard > competeGroup.getMaxAge()){
throw new BaseException(CodeEnum.MT_NOT_GROUP);
}
//TODO 修改组别信息
if(ObjectUtil.isNotNull(competeGroup)){player.setCompeteGroupId(competeGroup.getId());}
//字段不为空则修改
if(StrUtil.isNotEmpty(param.getPlayerName())){player.setName(param.getPlayerName());}

10
mt/src/main/resources/application-prod.yml

@ -8,7 +8,7 @@ spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
rabbitmq:
host: 127.0.0.1
host: 121.36.3.207
password: 111111
port: 5672
username: admin
@ -21,16 +21,16 @@ spring:
max-idle: 10
max-wait: -1ms
min-idle: 0
# password: ''
password: 'areowqr!@43ef'
password: ''
# password: 'areowqr!@43ef'
port: 6379
timeout: 1000ms
swagger:
enable: true
eureka:
instance:
ip-address: 127.0.0.1
# ip-address: 119.3.214.36
# ip-address: 127.0.0.1
ip-address: 121.36.106.168
gatewayUrl: https://www.tall.wiki/gateway/
notGatewayUrl: https://www.tall.wiki/

4
mt/src/main/resources/application.yml

@ -1,6 +1,6 @@
spring:
profiles:
active: dev
include: common, util-dev
active: prod
include: common, util-prod

6
mt/src/main/resources/druid-prod.yml

@ -15,8 +15,8 @@ spring:
maxWait: 60000
minEvictableIdleTimeMillis: 300000
minIdle: 5
password:
# password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
# password:
password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
poolPreparedStatements: true
servletLogSlowSql: true
servletLoginPassword: 111111
@ -28,7 +28,7 @@ spring:
testOnReturn: false
testWhileIdle: true
timeBetweenEvictionRunsMillis: 60000
url: jdbc:mysql://127.0.0.1/mt?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
url: jdbc:mysql://121.36.3.207/mt?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
username: root
validationQuery: SELECT 1 FROM DUAL
env: CCSENS_TALL

24
mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml

@ -473,4 +473,28 @@
tcc.id
) t2 ON t2.companyId = t3.companyId
</select>
<select id="getCompanyByNameAndType" resultType="com.ccsens.mt.bean.po.CompeteCompany">
SELECT
cc.id,
cc.`name`,
cc.type,
cc.compete_time_id AS competeTimeId,
cc.contacts_name AS contactsName,
cc.contacts_phone AS contactsPhone,
cc.user_id AS userId,
cc.join_num AS joinNum,
cc.leader_num AS leaderNum,
cc.coach_num AS coachNum,
cc.authorization AS authorization
FROM
t_compete_company AS cc
LEFT JOIN t_compete_player AS cp ON cc.id = cp.company_id
WHERE
cc.`name` = #{companyName}
AND cc.type = #{type}
AND cc.rec_status = 0
AND cp.`name` = #{playerName}
AND cp.rec_status = 0
</select>
</mapper>

11
mt/src/main/resources/mapper_dao/CompetePlayerDao.xml

@ -467,4 +467,15 @@
GROUP BY g.projectId,g.id
ORDER BY g.projectId,g.sequence
</select>
<select id="getPlayerByNameAndCompany" resultType="com.ccsens.mt.bean.po.CompetePlayer">
SELECT
*
FROM
t_compete_player AS cp
WHERE
cp.company_id = #{id}
AND cp.`name` = #{name}
AND cp.rec_status = 0
</select>
</mapper>

49
mt/src/main/resources/mapper_dao/CompeteProjectDao.xml

@ -20,14 +20,23 @@
(2021 - SUBSTR(tcp.id_card FROM 7 FOR 4)) as age,
tcpro.join_rule as joinRule
from t_compete_project tcpro
LEFT JOIN t_compete_project_player tcpp on tcpro.id = tcpp.project_id and tcpp.rec_status =0
LEFT JOIN t_compete_player tcp on tcp.id = tcpp.player_id and tcp.rec_status=0
LEFT JOIN t_compete_company tcc on tcc.id= tcp.company_id and tcc.rec_status=0
LEFT JOIN t_compete_group tcg on tcg.id =tcp.compete_group_id and tcg.rec_status=0
LEFT JOIN t_compete_project_player tcpp on tcpro.id = tcpp.project_id
LEFT JOIN t_compete_player tcp on tcp.id = tcpp.player_id
LEFT JOIN t_compete_company tcc on tcc.id= tcp.company_id
LEFT JOIN t_compete_group tcg on tcg.id =tcp.compete_group_id
WHERE tcpro.`level`=#{level}
and tcpro.type = #{type}
and tcpro.team = 0
and tcpro.rec_status=0
and tcpp.rec_status =0
and tcp.rec_status=0
and tcc.rec_status=0
and tcg.rec_status=0
</select>
<select id="getPlayerForTeam" resultType="com.ccsens.mt.bean.vo.TableVo$CompeteJoin" parameterType="java.util.Map">
@ -43,17 +52,27 @@
p.join_rule as joinRule
FROM
t_compete_project p
LEFT JOIN t_compete_team t on p.id = t.project_id and t.rec_status = 0
LEFT JOIN t_compete_team_member m on t.id = m.compete_team_id and m.rec_status = 0
LEFT JOIN t_compete_company c on t.company_id = c.id and c.rec_status = 0
LEFT JOIN t_compete_player pl on m.player_id = pl.id and pl.rec_status = 0
LEFT JOIN t_compete_group g on t.gender_group = g.sex and t.group_remark = g.group_remark and g.rec_status = 0 and g.type = 5
LEFT JOIN t_compete_team t on p.id = t.project_id
and t.rec_status = 0
LEFT JOIN t_compete_team_member m on t.id = m.compete_team_id
and m.rec_status = 0
LEFT JOIN t_compete_company c on t.company_id = c.id
LEFT JOIN t_compete_player pl on m.player_id = pl.id
and pl.rec_status = 0
LEFT JOIN t_compete_group g on t.gender_group = g.sex and t.group_remark = g.group_remark and g.type = #{type}
and g.rec_status = 0
WHERE
p.type = #{type}
and p.`level` = #{level}
and p.team = 1
and p.rec_status = 0
and c.rec_status = 0
</select>
<select id="queryProject" resultMap="com.ccsens.mt.persist.mapper.CompeteProjectMapper.BaseResultMap">
SELECT
@ -76,12 +95,12 @@
FROM
t_compete_project_player pp
LEFT JOIN t_compete_player p on pp.player_id = p.id and p.rec_status = 0
LEFT JOIN t_compete_group g on p.compete_group_id = g.id and g.rec_status = 0 and g.type = 4
LEFT JOIN t_compete_company c on p.company_id = c.id and c.rec_status = 0
LEFT JOIN t_compete_group g on p.compete_group_id = g.id and g.rec_status = 0 and g.type = 7
LEFT JOIN t_compete_company c on p.company_id = c.id
WHERE
pp.project_id = #{projectId}
and pp.rec_status = 0
and c.rec_status = 0
ORDER BY g.id
@ -91,12 +110,12 @@
t.id
FROM
t_compete_team t
LEFT JOIN t_compete_group g on t.group_remark = g.group_remark and t.gender_group = g.sex and g.rec_status = 0 and g.type = 4
LEFT JOIN t_compete_company c on t.company_id = c.id and c.rec_status = 0
LEFT JOIN t_compete_group g on t.group_remark = g.group_remark and t.gender_group = g.sex and g.rec_status = 0 and g.type = 7
LEFT JOIN t_compete_company c on t.company_id = c.id
WHERE
t.project_id = #{projectId}
and t.rec_status = 0
and c.rec_status = 0
ORDER BY g.id
</if>

9
recovery/src/main/java/com/ccsens/recovery/service/PatientService.java

@ -20,10 +20,8 @@ import com.ccsens.recovery.util.Constant;
import com.ccsens.util.JacksonUtil;
import com.ccsens.util.RedisUtil;
import com.ccsens.util.bean.message.common.*;
import com.ccsens.util.bean.message.server.ChannelStatusMessage;
import com.ccsens.util.config.RabbitMQConfig;
import com.ccsens.util.message.SwitchoverProjectUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.stereotype.Service;
@ -53,12 +51,8 @@ public class PatientService implements IPatientService{
@Resource
private RecipeRecordMapper recipeRecordMapper;
@Resource
private RecipeProjectMapper recipeProjectMapper;
@Resource
private RecDrillDao recDrillDao;
@Resource
private RecoveryDoctorMapper recoveryDoctorMapper;
@Resource
private PatientRobotMapper patientRobotMapper;
@Resource
private RecoveryCentreMapper recoveryCentreMapper;
@ -78,9 +72,6 @@ public class PatientService implements IPatientService{
@Override
public List<PatientVo.Patient> queryPatientByRecovery(HospitalDto.RecoveryCentreId param, Long userId) {
Long centreId = hospitalService.getCentreByProjectId(param.getProjectId());
// if(ObjectUtil.isNull(centreId)){
//// centreId = hospitalService.getCentreByUserId(userId);
//// }
return patientDao.queryPatientByHospitalId(centreId);
}

24
tall/src/main/java/com/ccsens/tall/rabbitMQ/MessageTest.java

@ -11,16 +11,16 @@ import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.factory.annotation.Autowired;
@Slf4j
public class MessageTest {
@Autowired
private AmqpTemplate rabbitTemplate;
public void messageTest() throws Exception {
ServerMessage serverMessage = new ServerMessage();
serverMessage.setType("Ping");
InMessage inMessage = InMessage.newToServerMessage(MessageConstant.DomainType.Server,serverMessage);
String j = JacksonUtil.beanToJson(inMessage);
log.info(j);
//FixMe 发送到消息队列
rabbitTemplate.convertAndSend(RabbitMQConfig.MESSAGE_QUEUE_NAME,j);
}
// @Autowired
// private AmqpTemplate rabbitTemplate;
//
// public void messageTest() throws Exception {
// ServerMessage serverMessage = new ServerMessage();
// serverMessage.setType("Ping");
// InMessage inMessage = InMessage.newToServerMessage(MessageConstant.DomainType.Server,serverMessage);
// String j = JacksonUtil.beanToJson(inMessage);
// log.info(j);
// //FixMe 发送到消息队列
// rabbitTemplate.convertAndSend(RabbitMQConfig.MESSAGE_QUEUE_NAME,j);
// }
}

16
tall/src/main/java/com/ccsens/tall/service/ProjectService.java

@ -890,6 +890,22 @@ public class ProjectService implements IProjectService {
}
projectFeign.setTaskDetails(taskDetailListFeign);
//复制上下道工序
copyLastTask(oldIdAndNewId,newProjectId);
}
}
public void copyLastTask(Map<Long,Long> oldIdAndNewId,Long newProjectId){
ProTaskDetailExample taskDetailExample = new ProTaskDetailExample();
taskDetailExample.createCriteria().andProjectIdEqualTo(newProjectId);
List<ProTaskDetail> proTaskDetails = taskDetailDao.selectByExample(taskDetailExample);
if (CollectionUtil.isNotEmpty(proTaskDetails)){
for (ProTaskDetail taskDetail : proTaskDetails) {
if(ObjectUtil.isNotNull(taskDetail.getLastTaskDetailId())){
taskDetail.setLastTaskDetailId(oldIdAndNewId.get(taskDetail.getLastTaskDetailId()));
taskDetailDao.updateByPrimaryKeySelective(taskDetail);
}
}
}
}

2
tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java

@ -359,7 +359,7 @@ public class TaskSubTimeService implements ITaskSubTimeService {
subTimeExample.createCriteria().andBeginTimeGreaterThan(currentTime).andTaskDetailIdEqualTo(proTaskDetail.getId());
List<ProTaskSubTime> taskSubTimes = taskSubTimeDao.selectByExample(subTimeExample);
if (CollectionUtil.isNotEmpty(taskSubTimes)){
taskSubTimes.get(0).setBeginTime(taskSubTimes.get(0).getBeginTime()+timeDifference);
taskSubTimes.get(0).setBeginTime(taskSubTimes.get(0).getBeginTime()-timeDifference);
taskSubTimeDao.updateByPrimaryKeySelective(taskSubTimes.get(0));
}
updateTimeDifference(timeDifference,proTaskDetail.getId());

2
tall/src/main/resources/application-greenvalley.yml

@ -32,7 +32,7 @@ swagger:
eureka:
instance:
# ip-address: 82.156.116.247
ip-address: 49.232.6.143
ip-address: 82.157.24.76
# 平台信息 0绿谷 1创时代

1
tall/src/main/resources/druid-greenvalley.yml

@ -28,6 +28,7 @@ spring:
testOnReturn: false
testWhileIdle: true
timeBetweenEvictionRunsMillis: 60000
# url: jdbc:mysql://82.157.24.76/tall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
username: root
validationQuery: SELECT 1 FROM DUAL

32
util/src/test/java/com/ccsens/util/VideoTest.java

@ -98,22 +98,22 @@ public class VideoTest {
// 指定资源地址,下载文件测试
// downloadFile("http://1258473962.vod2.myqcloud.com/1e124671vodcq1258473962/76557f735285890810478037694/VCj25SXUgFsA.mp4", "D:/temp/");
// List<Object[]> objects = PoiUtil.readExce(new File("C:\\Users\\逗\\Desktop\\跳绳比赛选手证件照.xlsx"), 0, null, 0, false);
// for (int i = 0; i < objects.size(); i++) {
// Object[] obj = objects.get(i);
// if (obj == null || obj.length < 4) {
// continue;
// }
// String path = (String)obj[3];
// String dir = "D:\\选手证件照\\" + obj[0] + "\\" + obj[1] + "\\" + obj[2];
// try{
// downloadFile(path, dir);
// } catch (Exception e) {
// System.out.println("下载失败:" + dir);
// e.printStackTrace();
//
// }
// }
List<Object[]> objects = PoiUtil.readExce(new File("C:\\Users\\10626\\Desktop\\跳绳比赛选手证件照.xlsx"), 0, null, 0, false);
for (int i = 0; i < objects.size(); i++) {
Object[] obj = objects.get(i);
if (obj == null || obj.length < 4) {
continue;
}
String path = (String)obj[3];
String dir = "D:\\跳绳\\太原站\\" + obj[0] + "\\" + obj[1] + "\\" + obj[2];
try{
downloadFile(path, dir);
} catch (Exception e) {
System.out.println("下载失败:" + dir);
e.printStackTrace();
}
}
}
}

16
wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java

@ -227,9 +227,21 @@ public class RecordService implements IRecordService{
prev = cur;
}
}
if (types.length > 1) {
if (types.length > 1 && CollectionUtil.isNotEmpty(records)) {
log.info("重新排序");
Collections.sort(records, (o1, o2) -> (int) (o1.getTime() - o2.getTime()));
Collections.sort(records, (o1, o2) ->{
log.info("o1:{},o2:{}",o1,o2);
if (o1 == null || o1.getTime() == null) {
if (o2 == null || o2.getTime() == null) {
return 0;
}
return -1;
}
if (o2 == null || o2.getTime() == null) {
return -1;
}
return o1.getTime() - o2.getTime() > 0 ? 1 : -1;
} );
}
return records;
}

4
wisdomcar/src/main/resources/application.yml

@ -1,7 +1,7 @@
spring:
profiles:
active: test
include: common, util-test
active: prod
include: common, util-prod

Loading…
Cancel
Save