Merge branch 'dev_0814' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_0814

esua-epdc/epdc-module/epdc-api/epdc-api-client/pom.xml

@@ -63,6 +63,11 @@
             <artifactId>epdc-commons-tools-phone</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-message-client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppAuthorizationDTO.java

@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
@@ -39,5 +39,8 @@ public class EpdcAppAuthorizationDTO implements Serializable {
      * 用户状态[AppUserStateEnum]
      */
     private String userState;
-
+    /**
+     * 网格名称
+     */
+    private String grid;
 }

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcRegisterResultDTO.java

@@ -0,0 +1,22 @@
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户注册后返回前端的数据
+ *
+ * @author work@yujt.net.cn
+ * @date 19/9/25 17:21
+ */
+@Data
+public class EpdcRegisterResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3032347110979742552L;
+
+    /**
+     * 微信openId
+     */
+    private String openId;
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java

@@ -11,6 +11,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppUserMaTokenFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
+import com.elink.esua.epdc.dto.result.EpdcRegisterResultDTO;
 import com.elink.esua.epdc.service.AppUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -38,7 +39,7 @@ public class ApiAppUserController {
      * @date 2019/9/9 10:41
      */
     @PostMapping("user/mp/regist")
-    public Result mpUserRegist(@RequestBody EpdcUserRegistFormDTO formDto) {
+    public Result<EpdcRegisterResultDTO> mpUserRegist(@RequestBody EpdcUserRegistFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return appUserService.mpUserRegist(formDto);
     }
@@ -52,7 +53,7 @@ public class ApiAppUserController {
      * @date 2019/9/9 10:41
      */
     @PostMapping("user/ma/regist")
-    public Result maUserRegist(@RequestBody EpdcUserRegistFormDTO formDto) {
+    public Result<EpdcRegisterResultDTO> maUserRegist(@RequestBody EpdcUserRegistFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return appUserService.maUserRegist(formDto);
     }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiMessageController.java

@@ -31,4 +31,18 @@ public class ApiMessageController {
     public Result sendSmsCode(String mobile) {
         return messageService.sendSmsCode(mobile);
     }
+
+    /**
+     * 注册审核结果，发送短信
+     *
+     * @param userId 用户ID
+     * @param state  审核状态[AppUserAuditStateEnum]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author work@yujt.net.cn
+     * @date 2019/9/25 15:18
+     */
+    @GetMapping("sms/registerResult")
+    public Result sendRegisterResult(String userId, String state) {
+        return messageService.sendRegisterResult(userId, state);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/MessageFeignClient.java

@@ -2,8 +2,10 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.form.EpdcRegisterResultSmsFormDTO;
 import com.elink.esua.epdc.feign.fallback.MessageFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 
 /**
@@ -23,6 +25,28 @@ public interface MessageFeignClient {
      * @author yujintao
      * @date 2019/9/11 20:59
      */
-    @GetMapping(value = "message/sms/sendCode")
+    @GetMapping("message/epdc-app/sms/sendCode")
     Result sendCode(String mobile);
+
+    /**
+     * 注册审核成功，发送短信通知
+     *
+     * @param mobile
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author work@yujt.net.cn
+     * @date 2019/9/25 16:14
+     */
+    @GetMapping("message/epdc-app/sms/registerSuccess")
+    Result registerSuccess(String mobile);
+
+    /**
+     * 注册审核失败，发送短信通知
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author work@yujt.net.cn
+     * @date 2019/9/25 16:20
+     */
+    @GetMapping(value = "message/epdc-app/sms/registerFailure", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result registerFailure(EpdcRegisterResultSmsFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -100,4 +100,15 @@ public interface UserFeignClient {
      */
     @PostMapping(value = "app-user/epdc-app/user/updateMobileOrAvatar", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result updateMobileOrAvatar(@RequestBody UserDTO userDTO);
+
+    /**
+     * 根据ID获取用户信息
+     *
+     * @param id
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     * @author work@yujt.net.cn
+     * @date 2019/9/25 15:29
+     */
+    @GetMapping(value = "app-user/user/{id}")
+    Result<UserDTO> getUserById(@PathVariable("id") String id);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/MessageFeignClientFallback.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.form.EpdcRegisterResultSmsFormDTO;
 import com.elink.esua.epdc.feign.MessageFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -19,4 +20,14 @@ public class MessageFeignClientFallback implements MessageFeignClient {
     public Result sendCode(String mobile) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_MESSAGE_SERVER, "sendCode", mobile);
     }
+
+    @Override
+    public Result registerSuccess(String mobile) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_MESSAGE_SERVER, "registerSuccess", mobile);
+    }
+
+    @Override
+    public Result registerFailure(EpdcRegisterResultSmsFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_MESSAGE_SERVER, "registerFailure", formDto);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@@ -51,4 +51,9 @@ public class UserFeignClientFallback implements UserFeignClient {
     public Result updateMobileOrAvatar(UserDTO userDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateMobileOrAvatar", userDTO);
     }
+
+    @Override
+    public Result<UserDTO> getUserById(String id) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserById", id);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java

@@ -9,6 +9,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppUserMaTokenFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
+import com.elink.esua.epdc.dto.result.EpdcRegisterResultDTO;
 
 /**
  * @author yujintao
@@ -25,7 +26,7 @@ public interface AppUserService {
      * @author yujintao
      * @date 2019/9/7 09:54
      */
-    Result mpUserRegist(EpdcUserRegistFormDTO formDto);
+    Result<EpdcRegisterResultDTO> mpUserRegist(EpdcUserRegistFormDTO formDto);
 
     /**
      * 公众号用户登录，获取token
@@ -89,5 +90,5 @@ public interface AppUserService {
      * @author yujintao
      * @date 2019/9/10 20:48
      */
-    Result maUserRegist(EpdcUserRegistFormDTO formDto);
+    Result<EpdcRegisterResultDTO> maUserRegist(EpdcUserRegistFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/MessageService.java

@@ -17,4 +17,15 @@ public interface MessageService {
      * @date 2019/9/11 21:04
      */
     Result sendSmsCode(String mobile);
+
+    /**
+     * 注册审核结果，发送短信
+     *
+     * @param userId 用户ID
+     * @param state  审核状态[AppUserAuditStateEnum]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author work@yujt.net.cn
+     * @date 2019/9/25 15:18
+     */
+    Result sendRegisterResult(String userId, String state);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -19,6 +19,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppUserMaTokenFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
+import com.elink.esua.epdc.dto.result.EpdcRegisterResultDTO;
 import com.elink.esua.epdc.enums.AppUserAuditStateEnum;
 import com.elink.esua.epdc.enums.AppUserRegisterSourceEnum;
 import com.elink.esua.epdc.enums.AppUserRegisterWayEnum;
@@ -179,6 +180,7 @@ public class AppUserServiceImpl implements AppUserService {
             authorization.setToken(token);
             authorization.setUserId(userId);
             authorization.setExpire(expire);
+            authorization.setGrid(userDto.getGrid());
             return new Result().ok(authorization);
         } else {
             return new Result().error("Login failed");
@@ -186,7 +188,7 @@ public class AppUserServiceImpl implements AppUserService {
     }
 
     @Override
-    public Result maUserRegist(EpdcUserRegistFormDTO formDto) {
+    public Result<EpdcRegisterResultDTO> maUserRegist(EpdcUserRegistFormDTO formDto) {
 
         this.verifyUserRegisterData(formDto);
 
@@ -196,12 +198,12 @@ public class AppUserServiceImpl implements AppUserService {
         HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
         userDto.setLastLoginIp(IpUtils.getIpAddr(request));
 
-        return userFeignClient.userRegist(userDto);
+        return getRegisterResult(userDto);
     }
 
 
     @Override
-    public Result mpUserRegist(EpdcUserRegistFormDTO formDto) {
+    public Result<EpdcRegisterResultDTO> mpUserRegist(EpdcUserRegistFormDTO formDto) {
 
         this.verifyUserRegisterData(formDto);
 
@@ -211,7 +213,23 @@ public class AppUserServiceImpl implements AppUserService {
         HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
         userDto.setLastLoginIp(IpUtils.getIpAddr(request));
 
-        return userFeignClient.userRegist(userDto);
+        return getRegisterResult(userDto);
+    }
+
+    /**
+     * 用户注册并组装返回数据
+     *
+     * @param userDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcRegisterResultDTO>
+     * @author work@yujt.net.cn
+     * @date 2019/9/25 17:26
+     */
+    private Result<EpdcRegisterResultDTO> getRegisterResult(UserDTO userDto) {
+        Result result = userFeignClient.userRegist(userDto);
+        EpdcRegisterResultDTO dto = new EpdcRegisterResultDTO();
+        dto.setOpenId(userDto.getWxOpenId());
+        result.setData(dto);
+        return result;
     }
 
     /**

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java

@@ -1,8 +1,13 @@
 package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.UserDTO;
+import com.elink.esua.epdc.dto.form.EpdcRegisterResultSmsFormDTO;
+import com.elink.esua.epdc.enums.AppUserAuditStateEnum;
 import com.elink.esua.epdc.feign.MessageFeignClient;
+import com.elink.esua.epdc.feign.UserFeignClient;
 import com.elink.esua.epdc.service.MessageService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -17,6 +22,9 @@ public class MessageServiceImpl implements MessageService {
     @Autowired
     private MessageFeignClient messageFeignClient;
 
+    @Autowired
+    private UserFeignClient userFeignClient;
+
     /**
      * 发送六位短信验证码
      *
@@ -29,4 +37,32 @@ public class MessageServiceImpl implements MessageService {
     public Result sendSmsCode(String mobile) {
         return messageFeignClient.sendCode(mobile);
     }
+
+    @Override
+    public Result sendRegisterResult(String userId, String state) {
+        if (StringUtils.isBlank(userId)) {
+            return new Result().error("用户ID无效");
+        }
+        AppUserAuditStateEnum userAuditStateEnum = AppUserAuditStateEnum.getEnumByValue(state);
+        if (null == userAuditStateEnum || userAuditStateEnum.equals(AppUserAuditStateEnum.UNDER_AUDIT)) {
+            return new Result().error("审核状态无效");
+        }
+        Result<UserDTO> userResult = userFeignClient.getUserById(userId);
+        if (!userResult.success() || null == userResult.getData()) {
+            return new Result().error("查询用户信息失败");
+        }
+        UserDTO userDto = userResult.getData();
+
+        switch (userAuditStateEnum) {
+            case AUDIT_FAILURE:
+                EpdcRegisterResultSmsFormDTO form = new EpdcRegisterResultSmsFormDTO();
+                form.setMobile(userDto.getMobile());
+                form.setReason(userDto.getRemark());
+                return this.messageFeignClient.registerFailure(form);
+            case AUDIT_SUCCESS:
+                return this.messageFeignClient.registerSuccess(userDto.getMobile());
+            default:
+                return new Result().error("短信发送失败");
+        }
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java

@@ -268,7 +268,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     public Result<IssueDetailResultDTO> getIssueDetail(IssueDetailFormDTO formDto) {
         IssueDetailResultDTO resultDTO = baseDao.selectOneIssueDetail(formDto);
         // 更新浏览数
-        epdcEventsService.modifyBrowseNumById(resultDTO.getEventId());
+        if (null != resultDTO && StringUtils.isNotEmpty(resultDTO.getEventId())) {
+            epdcEventsService.modifyBrowseNumById(resultDTO.getEventId());
+        }
         return new Result<IssueDetailResultDTO>().ok(resultDTO);
     }
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java

@@ -56,7 +56,7 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      * @Author: liuchuang
      * @Date: 2019/9/9 16:50
      */
-    List<ItemResultDTO> selectListOfItems(ItemFormDTO formDto);
+    List<ItemResultDTO> selectListOfItems(ItemFormDTO formDto, int[] states);
 
     /**
      * 移动端-项目详情

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -178,7 +178,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         formDto.setPageIndex(pageIndex);
         // 查询半年内的数据
         formDto.setSomeMonthsAgo(DateUtils.addDateMonths(new Date(), -6));
-        List<ItemResultDTO> data = baseDao.selectListOfItems(formDto);
+        // 查询数据状态
+        int[] states = {EventIssueItemState.ITEM_HANDLING, EventIssueItemState.ITEM_CLOSEING_CASE};
+        List<ItemResultDTO> data = baseDao.selectListOfItems(formDto, states);
         return new Result<List<ItemResultDTO>>().ok(data);
     }
 
@@ -186,7 +188,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public Result<ItemDetailResultDTO> getItemDetail(ItemDetailFormDTO formDto) {
         ItemDetailResultDTO resultDTO = baseDao.selectOneItemDetail(formDto);
         // 更新浏览数
-        epdcEventsService.modifyBrowseNumById(resultDTO.getEventId());
+        if (null != resultDTO && StringUtils.isNotEmpty(resultDTO.getEventId())) {
+            epdcEventsService.modifyBrowseNumById(resultDTO.getEventId());
+        }
         return new Result<ItemDetailResultDTO>().ok(resultDTO);
     }
 
@@ -525,7 +529,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         formDto.setPageIndex(pageIndex);
         formDto.setPageSize(formDTO.getPageSize());
         formDto.setUserId(formDTO.getUserId());
-        List<ItemResultDTO> data = baseDao.selectListOfItems(formDto);
+        // 查询数据状态
+        int[] states = {EventIssueItemState.ITEM_HANDLING, EventIssueItemState.ITEM_CLOSED, EventIssueItemState.ITEM_CLOSEING_CASE};
+        List<ItemResultDTO> data = baseDao.selectListOfItems(formDto, states);
         return new Result<List<ItemResultDTO>>().ok(data);
     }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml

@@ -112,16 +112,16 @@
 
     <select id="selectCountOfStatementNum" resultType="long">
         SELECT
-            CASE
-                WHEN
-                    SUM( REPLY_COUNT + LIKE_COUNT + UN_LIKE_COUNT ) IS NULL THEN
-                        0 ELSE SUM( REPLY_COUNT + LIKE_COUNT + UN_LIKE_COUNT )
-                        END AS statementNum
-                FROM
-                    epdc_event_comment
-                WHERE
-                DEL_FLAG = '0'
-                AND EVENT_ID = #{eventId}
+            COUNT( ID ) +
+        CASE
+                WHEN SUM( LIKE_COUNT + UN_LIKE_COUNT ) IS NULL THEN
+                0 ELSE SUM( LIKE_COUNT + UN_LIKE_COUNT )
+            END AS statementNum
+        FROM
+            epdc_event_comment
+        WHERE
+            DEL_FLAG = '0'
+            AND EVENT_ID = #{eventId}
     </select>
 
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml

@@ -78,7 +78,7 @@
             WHERE
                 i.DEL_FLAG = '0'
                 AND i.ID = #{id}
-            ORDER BY h.CREATED_TIME, img.CREATED_TIME DESC
+            ORDER BY h.CREATED_TIME DESC, img.CREATED_TIME DESC
     </select>
 
     <resultMap id="issueContentDetailMap" type="com.elink.esua.epdc.dto.issue.IssueContentDetailDTO">
@@ -337,7 +337,7 @@
             AND cate.DEL_FLAG = '0'
         WHERE
             issue.DEL_FLAG = '0'
-            AND issue.ISSUE_STATE IN ( 0, 2 )
+            AND issue.ISSUE_STATE = 0
             AND issue.GRID_ID = #{gridId}
             AND issue.ISSUE_CATEGORY_ID = #{categoryId}
     </select>

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -50,6 +50,8 @@
         item.ITEM_STATE
         WHEN 0 THEN
         '处理中'
+        WHEN 5 THEN
+        '已关闭'
         WHEN 10 THEN
         '已结案' ELSE ''
         END AS stateName
@@ -75,26 +77,30 @@
                 ON t1.EVENT_ID = t2.ID
                 AND t2.DEL_FLAG = '0'
                 WHERE t1.DEL_FLAG = '0'
-                AND t1.GRID_ID = #{deptId}
-                AND t1.ITEM_STATE IN (0, 10)
-                <if test="someMonthsAgo != null">
-                    <![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{someMonthsAgo}
+                AND t1.GRID_ID = #{formDto.deptId}
+                AND t1.ITEM_STATE IN
+                <foreach collection="states" item="state" index="no" open="("
+                         separator="," close=")">
+                    #{state}
+                </foreach>
+                <if test="formDto.someMonthsAgo != null">
+                    <![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{formDto.someMonthsAgo}
                 </if>
-                <if test="timestamp != null">
-                    <![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
+                <if test="formDto.timestamp != null">
+                    <![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{formDto.timestamp}
                 </if>
-                <if test='searchContent != null and searchContent != ""'>
-                    AND t1.ITEM_CONTENT LIKE CONCAT('%',#{searchContent},'%')
+                <if test='formDto.searchContent != null and formDto.searchContent != ""'>
+                    AND t1.ITEM_CONTENT LIKE CONCAT('%',#{formDto.searchContent},'%')
                 </if>
-                <if test='categoryId != null and categoryId != ""'>
-                    AND t1.ISSUE_CATEGORY_ID = #{categoryId}
+                <if test='formDto.categoryId != null and formDto.categoryId != ""'>
+                    AND t1.ISSUE_CATEGORY_ID = #{formDto.categoryId}
                 </if>
-                <if test='userId != null and userId != ""'>
-                    AND t1.USER_ID = #{userId}
+                <if test='formDto.userId != null and formDto.userId != ""'>
+                    AND t1.USER_ID = #{formDto.userId}
                 </if>
                 ORDER BY
                 t1.CREATED_TIME DESC
-                LIMIT #{pageIndex},#{pageSize}
+                LIMIT #{formDto.pageIndex},#{formDto.pageSize}
             ) temp
         )
         ORDER BY
@@ -200,6 +206,7 @@
             AND cate.DEL_FLAG = '0'
         WHERE
             item.DEL_FLAG = '0'
+            AND item.ITEM_STATE IN (0, 10)
             AND item.GRID_ID = #{gridId}
             AND item.ISSUE_CATEGORY_ID = #{categoryId}
     </select>

esua-epdc/epdc-module/epdc-message/epdc-message-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcRegisterResultSmsFormDTO.java

@@ -0,0 +1,30 @@
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 注册审核失败，发送短信通知
+ *
+ * @author work@yujt.net.cn
+ * @date 19/09/25 16:16
+ */
+@Data
+public class EpdcRegisterResultSmsFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 8397006980435259475L;
+
+    /**
+     * 手机号
+     */
+    @NotBlank(message = "手机号不能为空")
+    private String mobile;
+
+    /**
+     * 审核失败原因
+     */
+    @NotBlank(message = "审核失败原因不能为空")
+    private String reason;
+}

esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppSmsController.java

@@ -0,0 +1,80 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.dto.form.EpdcRegisterResultSmsFormDTO;
+import com.elink.esua.epdc.service.SysSmsService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 短信服务
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@RestController
+@RequestMapping(Constant.EPDC_APP + "sms")
+public class EpdcAppSmsController {
+
+    @Autowired
+    private SysSmsService sysSmsService;
+
+    /**
+     * 发送手机验证码
+     *
+     * @param mobile
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author yujintao
+     * @date 2019/9/6 16:50
+     */
+    @GetMapping("sendCode")
+    public Result sendCode(@RequestBody String mobile) {
+        if (StringUtils.isBlank(mobile)) {
+            return new Result().error();
+        }
+        sysSmsService.sendCode(mobile);
+        return new Result();
+    }
+
+    /**
+     * 注册审核成功，发送短信通知
+     *
+     * @param mobile
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author work@yujt.net.cn
+     * @date 2019/9/25 16:14
+     */
+    @GetMapping("registerSuccess")
+    public Result registerSuccess(@RequestBody String mobile) {
+        if (StringUtils.isBlank(mobile)) {
+            return new Result().error();
+        }
+        sysSmsService.registerSuccess(mobile);
+        return new Result();
+    }
+
+    /**
+     * 注册审核失败，发送短信通知
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author work@yujt.net.cn
+     * @date 2019/9/25 16:20
+     */
+    @GetMapping("registerFailure")
+    public Result registerFailure(@RequestBody EpdcRegisterResultSmsFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        sysSmsService.registerFailure(formDto);
+        return new Result();
+    }
+}

esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/controller/SmsController.java

@@ -26,7 +26,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
@@ -107,23 +106,6 @@ public class SmsController {
         return new Result();
     }
 
-    /**
-     * 发送手机验证码
-     *
-     * @param mobile
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @author yujintao
-     * @date 2019/9/6 16:50
-     */
-    @GetMapping("sendCode")
-    public Result sendCode(@RequestBody String mobile) {
-        if (StringUtils.isBlank(mobile)) {
-            return new Result().error();
-        }
-        sysSmsService.sendCode(mobile);
-        return new Result();
-    }
-
     @DeleteMapping
     @ApiOperation("删除")
     @LogOperation("删除")

esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/SysSmsService.java

@@ -11,6 +11,7 @@ package com.elink.esua.epdc.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.dto.SysSmsDTO;
+import com.elink.esua.epdc.dto.form.EpdcRegisterResultSmsFormDTO;
 import com.elink.esua.epdc.entity.SysSmsEntity;
 
 import java.util.LinkedHashMap;
@@ -52,5 +53,25 @@ public interface SysSmsService extends BaseService<SysSmsEntity> {
      * @date 2019/9/6 16:48
      */
     void sendCode(String mobile);
+
+    /**
+     * 发送注册成功短信通知
+     *
+     * @param mobile
+     * @return void
+     * @author work@yujt.net.cn
+     * @date 2019/9/25 16:11
+     */
+    void registerSuccess(String mobile);
+
+    /**
+     * 注册审核失败，发送短信通知
+     *
+     * @param formDto
+     * @return void
+     * @author work@yujt.net.cn
+     * @date 2019/9/25 16:20
+     */
+    void registerFailure(EpdcRegisterResultSmsFormDTO formDto);
 }
 

esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/impl/SysSmsServiceImpl.java

@@ -16,6 +16,7 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
 import com.elink.esua.epdc.commons.tools.utils.RandomUtil;
+import com.elink.esua.epdc.dto.form.EpdcRegisterResultSmsFormDTO;
 import com.elink.esua.epdc.exception.ModuleErrorCode;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
@@ -27,6 +28,7 @@ import com.elink.esua.epdc.redis.SmsRedis;
 import com.elink.esua.epdc.service.SysSmsService;
 import com.elink.esua.epdc.sms.AbstractSmsService;
 import com.elink.esua.epdc.sms.SmsFactory;
+import com.google.common.collect.Maps;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -116,4 +118,28 @@ public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity>
 
         this.insert(sms);
     }
+
+    @Override
+    public void registerSuccess(String mobile) {
+        //短信服务
+        AbstractSmsService service = SmsFactory.build();
+        if (service == null) {
+            throw new RenException(ModuleErrorCode.SMS_CONFIG);
+        }
+        //发送短信
+        service.sendSms(mobile, null, "市北e家亲", "SMS_174812277");
+    }
+
+    @Override
+    public void registerFailure(EpdcRegisterResultSmsFormDTO formDto) {
+        //短信服务
+        AbstractSmsService service = SmsFactory.build();
+        if (service == null) {
+            throw new RenException(ModuleErrorCode.SMS_CONFIG);
+        }
+        LinkedHashMap<String, String> map = Maps.newLinkedHashMap();
+        map.put("reason", formDto.getReason());
+        //发送短信
+        service.sendSms(formDto.getMobile(), map, "市北e家亲", "SMS_174807227");
+    }
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/UserFieldConsant.java

@@ -0,0 +1,21 @@
+package com.elink.esua.epdc.constant;
+
+/**
+ * 用户模块字段常量
+ *
+ * @author work@yujt.net.cn
+ * @date 19/9/25 16:50
+ */
+public interface UserFieldConsant {
+
+    String NICKNAME = "NICKNAME";
+    String FACE_IMG = "FACE_IMG";
+    String REAL_NAME = "REAL_NAME";
+    String GRID = "GRID";
+    String PARTY_FLAG = "PARTY_FLAG";
+    String REMARK = "REMARK";
+    String WX_OPEN_ID = "WX_OPEN_ID";
+    String WX_UNION_ID = "WX_UNION_ID";
+    String IDENTITY_NO = "IDENTITY_NO";
+    String REGISTER_TIME = "REGISTER_TIME";
+}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserAuditStateEnum.java

@@ -34,4 +34,14 @@ public enum AppUserAuditStateEnum {
         return value;
     }
 
+    public static AppUserAuditStateEnum getEnumByValue(String value) {
+        AppUserAuditStateEnum[] enums = AppUserAuditStateEnum.values();
+        for (AppUserAuditStateEnum anEnum : enums) {
+            if (anEnum.value().equals(value)) {
+                return anEnum;
+            }
+        }
+        return null;
+    }
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -29,6 +29,7 @@ import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.constant.UserFieldConsant;
 import com.elink.esua.epdc.dao.UserDao;
 import com.elink.esua.epdc.dto.PartyMembersDTO;
 import com.elink.esua.epdc.dto.UserDTO;
@@ -101,14 +102,14 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         wrapper.eq(StringUtils.isNotBlank(streetId), FieldConstant.STREET_ID, streetId);
         wrapper.eq(StringUtils.isNotBlank(communityId), FieldConstant.COMMUNITY_ID, communityId);
         wrapper.eq(StringUtils.isNotBlank(gridId), FieldConstant.GRID_ID, gridId);
-        wrapper.eq(StringUtils.isNotBlank(realName), "REAL_NAME", realName);
+        wrapper.eq(StringUtils.isNotBlank(realName), UserFieldConsant.REAL_NAME, realName);
         wrapper.eq(StringUtils.isNotBlank(mobile), FieldConstant.MOBILE, mobile);
-        wrapper.eq(StringUtils.isNotBlank(identityNo), "IDENTITY_NO", identityNo);
-        wrapper.ge(StringUtils.isNotBlank(startTime), "REGISTER_TIME", startTime);
-        wrapper.lt(StringUtils.isNotBlank(endTime), "REGISTER_TIME", endTime);
+        wrapper.eq(StringUtils.isNotBlank(identityNo), UserFieldConsant.IDENTITY_NO, identityNo);
+        wrapper.ge(StringUtils.isNotBlank(startTime), UserFieldConsant.REGISTER_TIME, startTime);
+        wrapper.lt(StringUtils.isNotBlank(endTime), UserFieldConsant.REGISTER_TIME, endTime);
         wrapper.eq(StringUtils.isNotBlank(auditState), FieldConstant.STATE, auditState);
         wrapper.in(CollUtil.isNotEmpty(deptIdList), FieldConstant.GRID_ID, deptIdList);
-        wrapper.eq(StringUtils.isNotBlank(isParty), "PARTY_FLAG", isParty);
+        wrapper.eq(StringUtils.isNotBlank(isParty), UserFieldConsant.PARTY_FLAG, isParty);
         return wrapper;
     }
 
@@ -174,9 +175,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     public Result<UserDTO> getUserForLoginByOpenId(String openId) {
         QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
         // 根据openId获取已提交注册的用户信息
-        wrapper.eq("WX_OPEN_ID", openId)
-                .select(FieldConstant.ID, "NICKNAME", "FACE_IMG", FieldConstant.MOBILE, "REAL_NAME",
-                        FieldConstant.STATE, FieldConstant.GRID_ID, "PARTY_FLAG", "REMARK")
+        wrapper.eq(UserFieldConsant.WX_OPEN_ID, openId)
+                .select(FieldConstant.ID, UserFieldConsant.NICKNAME, UserFieldConsant.FACE_IMG,
+                        FieldConstant.MOBILE, UserFieldConsant.REAL_NAME,
+                        FieldConstant.STATE, UserFieldConsant.GRID, FieldConstant.GRID_ID,
+                        UserFieldConsant.PARTY_FLAG, UserFieldConsant.REMARK)
                 .orderByDesc(FieldConstant.CREATED_TIME);
         List<UserEntity> userEntityList = this.baseDao.selectList(wrapper);
         if (CollUtil.isNotEmpty(userEntityList)) {
@@ -190,10 +193,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     public Result<UserDTO> getUserInfoByOpenId(String openId) {
         QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
         // 根据openId查询审核中或审核通过的用户信息
-        wrapper.eq("WX_OPEN_ID", openId)
+        wrapper.eq(UserFieldConsant.WX_OPEN_ID, openId)
                 .ne(FieldConstant.STATE, AppUserAuditStateEnum.AUDIT_FAILURE.value())
-                .select(FieldConstant.ID, "NICKNAME", "FACE_IMG", FieldConstant.MOBILE, "REAL_NAME",
-                        FieldConstant.STATE, FieldConstant.GRID_ID, "PARTY_FLAG");
+                .select(FieldConstant.ID, UserFieldConsant.NICKNAME, UserFieldConsant.FACE_IMG,
+                        FieldConstant.MOBILE, UserFieldConsant.REAL_NAME,
+                        FieldConstant.STATE, FieldConstant.GRID_ID, UserFieldConsant.PARTY_FLAG);
         UserEntity userEntity = this.baseDao.selectOne(wrapper);
         return new Result().ok(ConvertUtils.sourceToTarget(userEntity, UserDTO.class));
     }
@@ -201,10 +205,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Override
     public Result<UserDTO> getUserInfoByUnionId(String unionId) {
         QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq("WX_UNION_ID", unionId)
+        wrapper.eq(UserFieldConsant.WX_UNION_ID, unionId)
                 .ne(FieldConstant.STATE, AppUserAuditStateEnum.AUDIT_FAILURE.value())
-                .select(FieldConstant.ID, "NICKNAME", "FACE_IMG", FieldConstant.MOBILE, "REAL_NAME",
-                        FieldConstant.STATE, FieldConstant.GRID_ID, "PARTY_FLAG");
+                .select(FieldConstant.ID, UserFieldConsant.NICKNAME, UserFieldConsant.FACE_IMG,
+                        FieldConstant.MOBILE, UserFieldConsant.REAL_NAME,
+                        FieldConstant.STATE, FieldConstant.GRID_ID, UserFieldConsant.PARTY_FLAG);
         UserEntity userEntity = this.baseDao.selectOne(wrapper);
         return new Result().ok(ConvertUtils.sourceToTarget(userEntity, UserDTO.class));
     }