diff --git a/epmet-gateway/src/main/java/com/epmet/filter/UserTokenFilter.java b/epmet-gateway/src/main/java/com/epmet/filter/UserTokenFilter.java index 73f876906f..f66b0e6707 100644 --- a/epmet-gateway/src/main/java/com/epmet/filter/UserTokenFilter.java +++ b/epmet-gateway/src/main/java/com/epmet/filter/UserTokenFilter.java @@ -16,7 +16,8 @@ public interface UserTokenFilter { //是否过期 Claims claims = jwtTokenUtils.getClaimByToken(token); if (claims == null || jwtTokenUtils.isTokenExpired(claims.getExpiration())) { - throw new RenException(EpmetErrorCode.ERR401.getCode()); +// throw new RenException(EpmetErrorCode.ERR401.getCode()); + return null; } //获取用户ID String app = (String) claims.get("app"); diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index 1ae781d21c..d31b6fd06d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/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.8 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.9 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 20462901b2..ffb2ec42ff 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.8 + 0.0.9 com.epmet epmet-heart diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml index 5c503f97cf..a77c87301f 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml +++ b/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.5 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.9 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 7ab1904b5b..0b8b4b2f52 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/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"> 4.0.0 - 0.0.5 + 0.0.9 epmet-point com.epmet diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ExchangeController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ExchangeController.java index 5b1445db95..ff4bdd2285 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ExchangeController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ExchangeController.java @@ -1,12 +1,15 @@ package com.epmet.controller; -import com.epmet.common.token.annotation.Login; + import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.PointVerificationFormDTO; +import com.epmet.dto.form.ResiCommonUserIdFormDTO; +import com.epmet.dto.form.WorkPointVerificationFormDTO; import com.epmet.dto.result.PointVerificationResultDTO; +import com.epmet.dto.result.WorkPointVerficationListResultDTO; import com.epmet.service.PointVerificationLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -40,5 +43,18 @@ public class ExchangeController { return new Result().ok(pointVerificationLogService.verifyPoint(verificationParam)); } + /** + * @Description 获取工作端积分核销记录 + * @param verificationParam + * @return + * @author wangc + * @date 2020.07.24 16:08 + **/ + @PostMapping("recordmonthly") + public Result getStaffVerificationRecordMonthly(@LoginUser TokenDto token,@RequestBody WorkPointVerificationFormDTO verificationParam){ + verificationParam.setStaffId(token.getUserId()); + ValidatorUtils.validateEntity(verificationParam, ResiCommonUserIdFormDTO.UserIdGroup.class); + return new Result().ok(pointVerificationLogService.getStaffVerificationRecordMonthly(verificationParam)); + } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java index 319b3fa0ce..32d86c57a5 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java @@ -195,8 +195,8 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl o.getPoint()).sum() ); }else{ - int fromIndex = verificationParam.getPageNo() * verificationParam.getPageSize(); - int toIndex = (verificationParam.getPageNo() + 1) * verificationParam.getPageSize(); + int fromIndex = (verificationParam.getPageNo() - 1) * verificationParam.getPageSize(); + int toIndex = verificationParam.getPageNo() * verificationParam.getPageSize(); if(toIndex > dataList.size()) { toIndex = dataList.size(); } diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CategoryResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CategoryResultDTO.java new file mode 100644 index 0000000000..e2f377ad22 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CategoryResultDTO.java @@ -0,0 +1,40 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/7/29 13:36 + */ +@Data +public class CategoryResultDTO implements Serializable { + private static final long serialVersionUID = -5691303280428707533L; + + /** + * 一级类目名称 + */ + private String firstClass; + /** + * 二级类目名称 + */ + private String secondClass; + /** + * 三级类目名称 + */ + private String thirdClass; + /** + * 一级类目的ID编号 + */ + private String firstId; + /** + * 二级类目的ID编号 + */ + private String secondId; + /** + * 三级类目的ID编号 + */ + private String thirdId; +} diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index 6b838ffc27..c13ef834e2 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.75 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.77 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 3b51250c32..a52498eafc 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.75 + 0.0.77 com.epmet diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java index 0c61ff9ac2..b7fd36db66 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java @@ -1,12 +1,10 @@ package com.epmet.controller; -import com.baomidou.mybatisplus.extension.api.R; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.service.CodeService; -import oracle.jdbc.proxy.annotation.Post; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -179,4 +177,30 @@ public class CodeController { String result = codeService.mediaUpload(formDTO); return new Result().ok(result); } + + /** + * 获取小程序的第三方提交代码的页面配置 + * @author zhaoqifeng + * @date 2020/7/29 15:45 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("getpage") + public Result> getPage(@RequestBody CodeCommonFormDTO formDTO){ + List result = codeService.getPage(formDTO); + return new Result>().ok(result); + } + + /** + * 获取小程序的第三方提交代码的页面配置 + * @author zhaoqifeng + * @date 2020/7/29 15:45 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("getcategory") + public Result> getCategory(@RequestBody CodeCommonFormDTO formDTO) { + List result = codeService.getCategory(formDTO); + return new Result>().ok(result); + } } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java index 9bc9bb9bd1..2993445932 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java @@ -1,9 +1,11 @@ package com.epmet.service; import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.*; -import com.epmet.dto.result.*; +import com.epmet.dto.result.CategoryResultDTO; +import com.epmet.dto.result.QrCodeResultDTO; +import com.epmet.dto.result.ReasonResultDTO; +import com.epmet.dto.result.TemplateListResultDTO; import java.util.List; @@ -118,4 +120,22 @@ public interface CodeService { * @date 2020/7/17 11:20 */ String mediaUpload(MediaUploadFormDTO formDTO); + + /** + * 获取小程序的第三方提交代码的页面配置 + * @author zhaoqifeng + * @date 2020/7/29 13:34 + * @param formDTO + * @return java.util.List + */ + List getPage(CodeCommonFormDTO formDTO); + + /** + * 获取小程序的第三方提交代码的页面配置 + * @author zhaoqifeng + * @date 2020/7/29 13:34 + * @param formDTO + * @return java.util.List + */ + List getCategory(CodeCommonFormDTO formDTO); } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java index df3c720e97..0410944f5a 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java @@ -425,6 +425,34 @@ public class CodeServiceImpl implements CodeService { } } + @Override + public List getPage(CodeCommonFormDTO formDTO) { + //获取上传代码信息 + CodeCustomerDTO codeCustomerDTO = codeCustomerService.get(formDTO.getCodeId()); + //获取小程序调用令牌 + AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType()); + //调用微信API获取获取体验版二维码 + WxResult> wxResult = wxMaCodeService.getPage(authInfo.getAuthorizerAccessToken()); + if (!wxResult.success()) { + throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg()); + } + return wxResult.getData(); + } + + @Override + public List getCategory(CodeCommonFormDTO formDTO) { + //获取上传代码信息 + CodeCustomerDTO codeCustomerDTO = codeCustomerService.get(formDTO.getCodeId()); + //获取小程序调用令牌 + AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType()); + //调用微信API获取获取体验版二维码 + WxResult> wxResult = wxMaCodeService.getCategory(authInfo.getAuthorizerAccessToken()); + if (!wxResult.success()) { + throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg()); + } + return ConvertUtils.sourceToTarget(wxResult.getData(), CategoryResultDTO.class); + } + private void saveOperation(String customerId, String codeId, String version, String operation, String describe) { CodeOperationHistoryDTO operationDTO = new CodeOperationHistoryDTO(); operationDTO.setCustomerId(customerId); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaCategoryResult.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaCategoryResult.java index a8bbb25e5e..b0d8445e8b 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaCategoryResult.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaCategoryResult.java @@ -12,6 +12,7 @@ import java.io.Serializable; */ @Data public class WxMaCategoryResult implements Serializable { + private static final long serialVersionUID = 2504852726988873959L; /** * 一级类目名称 */ @@ -37,16 +38,4 @@ public class WxMaCategoryResult implements Serializable { */ private String thirdId; - /** - * 小程序的页面，可通过“获取小程序的第三方提交代码的页面配置”接口获得 - */ - private String address; - /** - * 小程序的标签，多个标签用空格分隔，标签不能多于10个，标签长度不超过20 - */ - private String tag; - /** - * 小程序页面的标题,标题长度不超过32 - */ - private String title; -} +} \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java index b22c03e451..b71f9b4c66 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java @@ -56,7 +56,7 @@ public interface WxMaCodeService { * @param accessToken 提交审核参数 * @return List */ - WxResult getCategory(String accessToken); + WxResult> getCategory(String accessToken); /** * 获取小程序的第三方提交代码的页面配置（仅供第三方开发者代小程序调用）. @@ -64,7 +64,7 @@ public interface WxMaCodeService { * @param accessToken 提交审核参数 * @return page_list 页面配置列表 */ - WxResult getPage(String accessToken); + WxResult> getPage(String accessToken); /** * 将第三方提交的代码包提交审核（仅供第三方开发者代小程序调用）. diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java index 3c9917d9e8..34c1931c88 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java @@ -97,7 +97,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService { } @Override - public WxResult getCategory(String accessToken) { + public WxResult> getCategory(String accessToken) { WxResult> result = new WxResult<>(); String url = WxMaCodeConstant.GET_CATEGORY_URL + "?" + "access_token=" + accessToken; Result getCategoryResult = HttpClientManager.getInstance().sendGet(url, null); @@ -115,7 +115,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService { } @Override - public WxResult getPage(String accessToken) { + public WxResult> getPage(String accessToken) { WxResult> result = new WxResult<>(); String url = WxMaCodeConstant.GET_PAGE_URL + "?" + "access_token=" + accessToken; Result getPageResult = HttpClientManager.getInstance().sendGet(url, null); diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml index 7863b22fa0..c47df434d3 100644 --- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml +++ b/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.30 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.32 ports: - "8094:8094" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index 73700bf6ec..8ca040d22a 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.30 + 0.3.32 com.epmet resi-mine diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 00de36ca93..020bec0c41 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/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.86 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.91 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 46c8fdc23d..d8f0af6e05 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.86 + 0.3.91 com.epmet epmet-user diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserCustomerEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserCustomerEntity.java index 0b92baede7..d7d5312df9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserCustomerEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserCustomerEntity.java @@ -20,12 +20,18 @@ public class UserCustomerEntity extends BaseEpmetEntity { /** * 客户Id - * */ + */ private String customerId; /** * 用户Id - * */ + */ private String userId; + /** + * 是否注册 1已注册 0未注册 + */ + private String isRegister; + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java index ac442388ad..f8b68ddb11 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java @@ -106,6 +106,7 @@ public class UserBaseInfoRedis { baseInfo.setCustomerId(relation.getCustomerId()); BelongGridNameFormDTO gridParam = new BelongGridNameFormDTO(); gridParam.setGridId(relation.getGridId()); + baseInfo.setRegisteredGridId(relation.getGridId()); Result gridResult = govOrgOpenFeignClient.getGridNameByGridId(gridParam); if(gridResult.success() && null != gridResult.getData() diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.6__add_isRegister.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.6__add_isRegister.sql new file mode 100644 index 0000000000..b7e91cf29b --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.6__add_isRegister.sql @@ -0,0 +1,8 @@ +ALTER TABLE `epmet_user`.`user_customer` +ADD COLUMN `IS_REGISTER` varchar(1) NOT NULL DEFAULT 0 COMMENT '是否注册 1注册； 0未注册' AFTER `USER_ID`; +UPDATE user_customer uc, +register_relation t +SET uc.IS_REGISTER = 1 +WHERE + uc.CUSTOMER_ID = t.CUSTOMER_ID + AND t.USER_ID = uc.USER_ID; \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml index cfacc58191..11dc871caa 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml @@ -107,8 +107,8 @@ wechat.USER_ID = #{item} - - AND base.REAL_NAME = #{realName} + + AND (base.REAL_NAME LIKE concat('%',#{realName},'%') OR wechat.NICKNAME LIKE concat('%',#{realName},'%')) ORDER BY base.REAL_NAME , wechat.NICKNAME