Browse Source

Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix

dev_shibei_match
wangchao 5 years ago
parent
commit
fc974dd269
  1. 2
      epmet-auth/deploy/docker-compose-dev.yml
  2. 2
      epmet-auth/pom.xml
  3. 3
      epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java
  4. 15
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/ActListCommonFormDTO.java
  5. 2
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/CancelActFormDTO.java
  6. 2
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/TestGrantFormDTO.java
  7. 2
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActResultDTO.java
  8. 2
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActResultDTO.java
  9. 2
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/Grid.java
  10. 2
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActResultDTO.java
  11. 2
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/PublishActInitResultDTO.java
  12. 2
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/SponsorResultDTO.java
  13. 2
      epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
  14. 2
      epmet-module/epmet-heart/epmet-heart-server/pom.xml
  15. 10
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActMessageConstant.java
  16. 13
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java
  17. 14
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
  18. 12
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java
  19. 3
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
  20. 12
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java
  21. 11
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
  22. 1
      epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointDetailResultDTO.java
  23. 2
      epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
  24. 2
      epmet-module/epmet-point/epmet-point-server/pom.xml
  25. 1
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
  26. 1
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java
  27. 2
      epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml
  28. 2
      epmet-module/resi-mine/resi-mine-server/pom.xml
  29. 7
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java
  30. 2
      epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
  31. 2
      epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
  32. 2
      epmet-user/epmet-user-server/pom.xml
  33. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java

2
epmet-auth/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-auth-server:
container_name: epmet-auth-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.66
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.67
ports:
- "8081:8081"
network_mode: host # 使用现有网络

2
epmet-auth/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.66</version>
<version>0.3.67</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-cloud</artifactId>

3
epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java

@ -283,13 +283,16 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
public UserTokenResultDTO register(RegisterFormDTO formDTO) {
//1.调用epmet-third服务,完成信息注册
String data = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.REGISTER_URL, JSON.toJSONString(formDTO)).getData();
logger.info("data数据为:"+data);
JSONObject toResult = JSON.parseObject(data);
Result result = ConvertUtils.mapToEntity(toResult, Result.class);
logger.info("转换的result结果为:"+result);
if (!result.success()) {
logger.error(String.format("调用epmet_third服务初始化用户信息失败,数据来源[%s],手机号[%s],userId:[%S]", formDTO.getSource(), formDTO.getPhone(), formDTO.getUserId()));
throw new RenException(result.getCode());
}
Object RegisterResult = result.getData();
logger.info("getData()数据为:"+RegisterResult);
JSONObject jsonObject = JSON.parseObject(RegisterResult.toString());
RegisterResultDTO resultDTO = ConvertUtils.mapToEntity(jsonObject, RegisterResultDTO.class);

15
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/ActListCommonFormDTO.java

@ -2,11 +2,13 @@ package com.epmet.dto.form.work;
import lombok.Data;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* 描述一下
* 工作端 进行中-活动列表已取消-活动列表已结束-活动列表 统一入参DTO
*
* @author yinzuomei@elink-cn.com
* @date 2020/7/23 21:21
@ -20,4 +22,15 @@ public class ActListCommonFormDTO implements Serializable {
*/
@NotBlank(message = "客户id不能为空", groups = {AddUserInternalGroup.class })
private String customerId;
/**
* 页码
*/
@Min(1)
private Integer pageNo;
/**
* 每页显示条数
*/
private Integer pageSize = 20;
}

2
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/CancelActFormDTO.java

@ -7,7 +7,7 @@ import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 描述一下
* 取消活动入参DTO
*
* @author yinzuomei@elink-cn.com
* @date 2020/7/26 17:23

2
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/TestGrantFormDTO.java

@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* 描述一下
* 测试发放积分入参DTO
*
* @author yinzuomei@elink-cn.com
* @date 2020/7/30 12:15

2
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActResultDTO.java

@ -7,7 +7,7 @@ import java.io.Serializable;
import java.util.Date;
/**
* 描述一下
* 工作端已取消-活动列表返参DTO
*
* @author yinzuomei@elink-cn.com
* @date 2020/7/23 23:09

2
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActResultDTO.java

@ -7,7 +7,7 @@ import java.io.Serializable;
import java.util.Date;
/**
* 描述一下
* 工作端已结束-活动列表 返参DTO
*
* @author yinzuomei@elink-cn.com
* @date 2020/7/23 23:19

2
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/Grid.java

@ -25,7 +25,7 @@ import java.io.Serializable;
/**
* 添加组织-接口返参
*
* @author sun
* @author yinzuomei
*/
@Data
public class Grid implements Serializable {

2
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActResultDTO.java

@ -8,7 +8,7 @@ import java.io.Serializable;
import java.util.Date;
/**
* 描述一下
* 工作端进行中-活动列表返参DTO
*
* @author yinzuomei@elink-cn.com
* @date 2020/7/23 21:23

2
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/PublishActInitResultDTO.java

@ -5,7 +5,7 @@ import lombok.Data;
import java.io.Serializable;
/**
* 描述一下
* 发布活动初始化接口返参
*
* @author yinzuomei@elink-cn.com
* @date 2020/7/20 17:49

2
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/SponsorResultDTO.java

@ -6,7 +6,7 @@ import java.io.Serializable;
import java.util.List;
/**
* 描述一下
* 活动主办方 返参DTO
*
* @author yinzuomei@elink-cn.com
* @date 2020/7/23 20:23

2
epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-heart-server:
container_name: epmet-heart-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.30
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.32
ports:
- "8111:8111"
network_mode: host # 使用现有网络

2
epmet-module/epmet-heart/epmet-heart-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.0.30</version>
<version>0.0.32</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-heart</artifactId>

10
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActMessageConstant.java

@ -26,16 +26,6 @@ public interface ActMessageConstant {
*/
String ACT_POINTS_EVENT_REMARK="参与%s";
/**
* 居民端-用户认证志愿者发送消息
*/
String POINTS_EVENT_VOLUNTEER_AUTHENTICATE="用户%s,认证志愿者";
/**
* 居民端-添加实况发送消息
*/
String ACT_POINTS_EVENT_VOLUNTEER_LIVE="用户%s,添加活动实况,活动:%s";
/**
* 工作端-重新发布活动通知待审核+已经审核通过的用户
*/

13
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java

@ -23,6 +23,7 @@ import com.epmet.dto.form.resi.ResiActBaseFormDTO;
import com.epmet.dto.form.resi.ResiActDetailFormDTO;
import com.epmet.dto.form.resi.ResiLatestActFormDTO;
import com.epmet.dto.form.resi.ResiMyActFormDTO;
import com.epmet.dto.form.work.ActListCommonFormDTO;
import com.epmet.dto.result.resi.*;
import com.epmet.dto.result.work.*;
import com.epmet.entity.ActInfoEntity;
@ -228,30 +229,30 @@ public interface ActInfoDao extends BaseDao<ActInfoEntity> {
/**
* @return java.util.List<com.epmet.dto.result.work.InProgressActResultDTO>
* @param customerId
* @param actListCommonFormDTO
* @author yinzuomei
* @description 查询正在进行中的活动列表
* @Date 2020/7/23 21:58
**/
List<InProgressActResultDTO> selectInprogress(String customerId);
List<InProgressActResultDTO> selectInprogress(ActListCommonFormDTO actListCommonFormDTO);
/**
* @return java.util.List<com.epmet.dto.result.work.CanceledActResultDTO>
* @param customerId
* @param actListCommonFormDTO
* @author yinzuomei
* @description 已取消-活动列表
* @Date 2020/7/23 23:13
**/
List<CanceledActResultDTO> selectCanceledList(String customerId);
List<CanceledActResultDTO> selectCanceledList(ActListCommonFormDTO actListCommonFormDTO);
/**
* @return java.util.List<com.epmet.dto.result.work.FinishedActResultDTO>
* @param customerId
* @param actListCommonFormDTO
* @author yinzuomei
* @description 已结束-活动列表
* @Date 2020/7/23 23:21
**/
List<FinishedActResultDTO> selectFinishedList(String customerId);
List<FinishedActResultDTO> selectFinishedList(ActListCommonFormDTO actListCommonFormDTO);
/**
* @return java.util.List<com.epmet.dto.result.work.JoinedUserResultDTO>

14
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java

@ -23,6 +23,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ConvertUtils;
@ -297,13 +298,12 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
} else if (currentTime.after(actInfoEntity.getSignUpEndTime()) && currentTime.before(actInfoEntity.getActStartTime())) {
/*报名结束,活动未开始:显示:截止报名*/
return ActConstant.CURRENT_STATUS_USER_END_SIGN_UP;
} else if (currentTime.after(actInfoEntity.getActStartTime()) && currentTime.before(actInfoEntity.getActEndTime())) {
// 活动开始-结束的时间段内: 显示:已开始
} else if (currentTime.after(actInfoEntity.getActStartTime())) {
// 活动开始以后: 显示:已开始
return ActConstant.CURRENT_STATUS_USER_IN_PROGRESS;
} else {
// 最后,显示:已结束
return ActConstant.CURRENT_STATUS_USER_FINISHED;
}
// 活动的状态是:finished ,显示:已结束
return ActConstant.CURRENT_STATUS_USER_FINISHED;
}
/**
@ -326,8 +326,8 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
return ActConstant.CURRENT_STATUS_USER_POINTS_CONFIRM;
}
if (currentTime.after(actInfoEntity.getActStartTime()) && currentTime.before(actInfoEntity.getActEndTime())) {
/* 活动开始-结束的时间段内 */
if (currentTime.after(actInfoEntity.getActStartTime())) {
/* 活动开始 */
return ActConstant.CURRENT_STATUS_USER_IN_PROGRESS;
} else if (currentTime.before(actInfoEntity.getSignUpEndTime())) {
/* 报名截至时间前 */

12
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java

@ -39,6 +39,7 @@ import com.epmet.commons.tools.utils.SendMqMsgUtils;
import com.epmet.constant.ActMessageConstant;
import com.epmet.dao.ActLivePicDao;
import com.epmet.dao.ActLiveRecDao;
import com.epmet.dto.ActInfoDTO;
import com.epmet.dto.ActLivePicDTO;
import com.epmet.dto.ActLiveRecDTO;
import com.epmet.dto.form.resi.ResiActInsertLiveFormDTO;
@ -48,6 +49,7 @@ import com.epmet.entity.ActLivePicEntity;
import com.epmet.entity.ActLiveRecEntity;
import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.redis.ActLiveRecRedis;
import com.epmet.service.ActInfoService;
import com.epmet.service.ActLiveRecService;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@ -77,6 +79,9 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
@Autowired
private ActLivePicDao actLivePicDao;
@Autowired
private ActInfoService actInfoService;
@Value("${openapi.scan.server.url}")
private String scanApiUrl;
@Value("${openapi.scan.method.textSyncScan}")
@ -217,8 +222,9 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
}
private void grantActPoints(ResiActInsertLiveFormDTO formDTO){
//备注
String remark=String.format(ActMessageConstant.ACT_POINTS_EVENT_VOLUNTEER_LIVE,formDTO.getUserId(),formDTO.getActId());
// 查询 活动信息
ActInfoDTO actInfoDTO = actInfoService.get(formDTO.getActId());
MqBaseMsgDTO mqBaseMsgDTO=new MqBaseMsgDTO();
//mq的事件类型
mqBaseMsgDTO.setEventClass(EventEnum.ACTIVE_INSERT_LIVE.getEventClass());
@ -230,7 +236,7 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
actPointEventMsg.setUserId(formDTO.getUserId());
actPointEventMsg.setActionFlag(MqConstant.PLUS);
actPointEventMsg.setIsCommon(false);
actPointEventMsg.setRemark(remark);
actPointEventMsg.setRemark(actInfoDTO.getTitle());
actPointEventMsg.setSourceId(formDTO.getActId());
actPointEventMsgList.add(actPointEventMsg);

3
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java

@ -99,8 +99,6 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
}
private void grantActPoints(ResiVolunteerAuthenticateFormDTO formDTO){
//备注
String remark=String.format(ActMessageConstant.POINTS_EVENT_VOLUNTEER_AUTHENTICATE,formDTO.getUserId());
MqBaseMsgDTO mqBaseMsgDTO=new MqBaseMsgDTO();
//mq的事件类型
mqBaseMsgDTO.setEventClass(EventEnum.REGISTER_VOLUNTEER.getEventClass());
@ -112,7 +110,6 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
actPointEventMsg.setUserId(formDTO.getUserId());
actPointEventMsg.setActionFlag(MqConstant.PLUS);
actPointEventMsg.setIsCommon(false);
actPointEventMsg.setRemark(remark);
actPointEventMsgList.add(actPointEventMsg);
mqBaseMsgDTO.setMsg(JSON.toJSONString(actPointEventMsgList));

12
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java

@ -532,7 +532,9 @@ public class WorkActServiceImpl implements WorkActService {
**/
@Override
public List<InProgressActResultDTO> queryInProgressList(ActListCommonFormDTO formDTO) {
List<InProgressActResultDTO> list = actInfoDao.selectInprogress(formDTO.getCustomerId());
int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
formDTO.setPageNo(pageIndex);
List<InProgressActResultDTO> list = actInfoDao.selectInprogress(formDTO);
Date nowDate = new Date();
for (InProgressActResultDTO inProgressActResultDTO : list) {
// 活动状态:报名中:signing_up;截止报名: end_sign_up; 已开始: in_progress; 已报满: enough
@ -596,7 +598,9 @@ public class WorkActServiceImpl implements WorkActService {
**/
@Override
public List<CanceledActResultDTO> queryCanceledList(ActListCommonFormDTO formDTO) {
return actInfoDao.selectCanceledList(formDTO.getCustomerId());
int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
formDTO.setPageNo(pageIndex);
return actInfoDao.selectCanceledList(formDTO);
}
/**
@ -608,7 +612,9 @@ public class WorkActServiceImpl implements WorkActService {
**/
@Override
public List<FinishedActResultDTO> queryFinishedList(ActListCommonFormDTO formDTO) {
return actInfoDao.selectFinishedList(formDTO.getCustomerId());
int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
formDTO.setPageNo(pageIndex);
return actInfoDao.selectFinishedList(formDTO);
}
/**

11
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml

@ -303,7 +303,6 @@
and <![CDATA[ DATE_FORMAT(i.SIGN_UP_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> NOW()
then 'end_sign_up'
when <![CDATA[ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> NOW()
and <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> NOW()
then 'in_progress'
end as actCurrentState
FROM act_info i
@ -311,7 +310,6 @@
WHERE i.DEL_FLAG = '0'
AND i.CUSTOMER_ID = #{customerId}
AND i.ACT_STATUS != 'finished' AND i.ACT_STATUS != 'canceled'
AND <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') > ]]> NOW()
ORDER BY i.CREATED_TIME DESC
LIMIT 0, #{num}
</select>
@ -475,7 +473,7 @@
</select>
<!-- 查询正在进行中的活动列表 -->
<select id="selectInprogress" parameterType="java.lang.String" resultType="com.epmet.dto.result.work.InProgressActResultDTO">
<select id="selectInprogress" parameterType="com.epmet.dto.form.work.ActListCommonFormDTO" resultType="com.epmet.dto.result.work.InProgressActResultDTO">
SELECT
ai.id AS actId,
ai.TITLE AS title,
@ -504,10 +502,11 @@
AND ai.ACT_STATUS = 'published'
and ai.CUSTOMER_ID=#{customerId}
order by ai.CREATED_TIME desc
limit #{pageNo}, #{pageSize}
</select>
<!-- 已取消-活动列表 -->
<select id="selectCanceledList" parameterType="java.lang.String" resultType="com.epmet.dto.result.work.CanceledActResultDTO">
<select id="selectCanceledList" parameterType="com.epmet.dto.form.work.ActListCommonFormDTO" resultType="com.epmet.dto.result.work.CanceledActResultDTO">
SELECT
ai.id AS actId,
ai.TITLE AS title,
@ -525,10 +524,11 @@
AND ai.CUSTOMER_ID = #{customerId}
ORDER BY
ai.CREATED_TIME DESC
limit #{pageNo}, #{pageSize}
</select>
<!-- 已结束-活动列表 -->
<select id="selectFinishedList" parameterType="java.lang.String" resultType="com.epmet.dto.result.work.FinishedActResultDTO">
<select id="selectFinishedList" parameterType="com.epmet.dto.form.work.ActListCommonFormDTO" resultType="com.epmet.dto.result.work.FinishedActResultDTO">
SELECT
ai.id AS actId,
ai.TITLE AS title,
@ -546,6 +546,7 @@
AND ai.CUSTOMER_ID = #{customerId}
ORDER BY
ai.CREATED_TIME DESC
limit #{pageNo}, #{pageSize}
</select>
<!-- 已结束-已参加人员列表 -->

1
epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointDetailResultDTO.java

@ -18,6 +18,7 @@ public class PointDetailResultDTO implements Serializable {
private String ruleDesc;
private Integer point;
private String pointUnit;
private String pointUnitDesc;
private Integer upLimit;
private Boolean enabledFlag;
private String upLimitDesc;

2
epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-point-server:
container_name: epmet-point-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.21
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.22
ports:
- "8112:8112"
network_mode: host # 使用现有网络

2
epmet-module/epmet-point/epmet-point-server/pom.xml

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.0.21</version>
<version>0.0.22</version>
<parent>
<artifactId>epmet-point</artifactId>
<groupId>com.epmet</groupId>

1
epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java

@ -131,6 +131,7 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
PointDetailResultDTO resultDTO = ConvertUtils.sourceToTarget(pointRuleEntity, PointDetailResultDTO.class);
resultDTO.setRuleId(pointRuleEntity.getId());
resultDTO.setEnabledFlag(NumConstant.ONE_STR.equals(pointRuleEntity.getEnabledFlag()) ? true : false);
resultDTO.setPointUnitDesc(PointUnitEnum.getEnum(pointRuleEntity.getPointUnit()).getDesc());
return resultDTO;
}

1
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java

@ -182,6 +182,7 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
userEntity.setPhone(formDTO.getPhone());
userEntity.setRealName(formDTO.getSurName());
userEntity.setGender(formDTO.getGender().toString());
userEntity.setSource(formDTO.getSource());
if (paUserDao.insert(userEntity) < NumConstant.ONE) {
throw new RenException(PaConstant.SAVE_USER_EXCEPTION);
}

2
epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-mine-server:
container_name: resi-mine-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.36
image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.37
ports:
- "8094:8094"
network_mode: host # 使用现有网络

2
epmet-module/resi-mine/resi-mine-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.36</version>
<version>0.3.37</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-mine</artifactId>

7
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java

@ -50,14 +50,15 @@ public class ResiMineGridController {
/**
* @return
* @param formDTO
* @param appId
* @Author sun
* @Description 单客户-获取用户最近访问网格
* @Date 2020/8/3
**/
@GetMapping("latestgridinfo")
public Result<LatestGridInfoResultDTO> latestGridInfo(@LoginUser TokenDto token, @RequestBody LatestGridInfoFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
public Result<LatestGridInfoResultDTO> latestGridInfo(@LoginUser TokenDto token, @RequestParam("appId") String appId) {
LatestGridInfoFormDTO formDTO = new LatestGridInfoFormDTO();
formDTO.setAppId(appId);
formDTO.setUserId(token.getUserId());
return new Result<LatestGridInfoResultDTO>().ok(resiMineGridService.latestGridInfo(formDTO));
}

2
epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@ -257,6 +257,6 @@ public interface EpmetUserOpenFeignClient {
* @Description 单客户-获取用户最近访问网格
* @Date 2020/8/3
**/
@GetMapping(value = "epmetuser/gridlatest/latestgridinfo")
@PostMapping(value = "epmetuser/gridlatest/latestgridinfo")
Result<LatestGridInfoResultDTO> latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO);
}

2
epmet-user/epmet-user-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-user-server:
container_name: epmet-user-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.105
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.106
ports:
- "8087:8087"
network_mode: host # 不会创建新的网络

2
epmet-user/epmet-user-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.105</version>
<version>0.3.106</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-user</artifactId>

2
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java

@ -138,7 +138,7 @@ public class GridLatestController {
* @Description 单客户-根据客户Id和userId查询用户最后一次访问的网格
* @Date 2020/8/3
**/
@GetMapping("latestgridinfo")
@PostMapping("latestgridinfo")
public Result<LatestGridInfoResultDTO> latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO){
return new Result<LatestGridInfoResultDTO>().ok(gridLatestService.latestGridInfo(formDTO));
}

Loading…
Cancel
Save