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

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -249,7 +249,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         } catch (Exception e) {
             log.error("->getCompleteDept:::部门ID格式转换异常:::deptId->{}", deptId);
         }
-        if (null == deptId) {
+        if (null == deptIdL) {
             return new Result().error("参数格式异常");
         }
         CompleteDeptDTO completeDept = this.baseDao.getParentAndAllDept(deptIdL);

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

@@ -17,9 +17,11 @@
 
 package com.elink.esua.epdc.dto;
 
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -36,18 +38,34 @@ public class ScanSwitchDTO implements Serializable {
     /**
      * id
      */
+    @NotBlank(message = "ID不能为空")
 	private String id;
 
     /**
      * 扫码开关 0关1开
      */
-	private String scanSwitch;
+	private int scanFlag;
 
     /**
      * 删除标识  0：未删除    1：删除
      */
 	private String delFlag;
 
+    /**
+     * 维护状态：0-关闭维护，1-开启维护
+     */
+    private int maintainFlag;
+
+    /**
+     * 维护信息
+     */
+    private String maintainInfo;
+
+    /**
+     * 版本号
+     */
+    private String versionNum;
+
     /**
      * 创建者
      */

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppScanVersionNumDTO.java

@@ -0,0 +1,41 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * 扫码开关
+ *
+ * @author wanggongfeng
+ * @since v1.0.0 2019-10-10
+ */
+@Data
+public class EpdcAppScanVersionNumDTO implements Serializable {
+
+    /**
+     * 版本号
+     */
+    @NotBlank(message = "版本号不能为空")
+    private String versionNum;
+
+}

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java

@@ -57,4 +57,19 @@ public class EpdcCompleteUserInfoFormDTO implements Serializable {
      */
     @NotBlank(message = "性别不能为空")
     private String sex;
+
+    /**
+     * 微信code
+     */
+    private String wxCode;
+
+    /**
+     * 用户信息
+     */
+    private String encryptedData;
+
+    /**
+     * 加密算法的初始向量
+     */
+    private String iv;
 }

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

@@ -0,0 +1,52 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+
+/**
+ * 扫码开关
+ *
+ * @author wanggongfeng
+ * @since v1.0.0 2019-10-10
+ */
+@Data
+public class EpdcAppScanFlagDTO implements Serializable {
+
+    /**
+     * 扫码开关 0关1开
+     */
+    @NotNull
+	private int scanFlag;
+
+    /**
+     * 维护状态：0-关闭维护，1-开启维护
+     */
+    @NotNull
+    private int maintainFlag;
+
+    /**
+     * 维护信息
+     */
+    private String maintainInfo;
+
+}

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

@@ -253,4 +253,15 @@ public class ApiAppUserController {
         return appUserService.invitationRecord();
     }
 
+    /**
+     * @param tokenDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 查看用户是否已保存unionId
+     * @Date 2019/12/7 14:32
+     **/
+    @GetMapping("user/checkWxUnionId")
+    public Result checkWxUnionId(@LoginUser TokenDto tokenDto) {
+        return appUserService.checkWxUnionId(tokenDto);
+    }
 }

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

@@ -18,17 +18,19 @@
 package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
-import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.dto.ScanSwitchDTO;
+import com.elink.esua.epdc.dto.form.EpdcAppScanVersionNumDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppScanFlagDTO;
 import com.elink.esua.epdc.service.ScanSwitchService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.Map;
 
 
@@ -84,13 +86,15 @@ public class ApiScanSwitchController {
 
     /***
      * 前端接口开关
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.ScanSwitchDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcAppScanFlagDTO>
      * @author qushutong
      * @date 2019/10/10 11:58
      */
     @GetMapping("scanSwitch")
-    public Result<Map<String,String>> get(){
+    public Result<EpdcAppScanFlagDTO> get(EpdcAppScanVersionNumDTO scanVersionNumDTO){
-        Map<String,String> data = scanSwitchService.getOne();
+        //效验数据
-        return new Result<Map<String,String>>().ok(data);
+        ValidatorUtils.validateEntity(scanVersionNumDTO);
+        EpdcAppScanFlagDTO data = scanSwitchService.getOneScanInfo(scanVersionNumDTO);
+        return new Result<EpdcAppScanFlagDTO>().ok(data);
     }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ScanSwitchDao.java

@@ -18,6 +18,8 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.form.EpdcAppScanVersionNumDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppScanFlagDTO;
 import com.elink.esua.epdc.entity.ScanSwitchEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -30,4 +32,13 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScanSwitchDao extends BaseDao<ScanSwitchEntity> {
 
+    /***
+     * 前端获取开关
+     * @param
+     * @return com.elink.esua.epdc.dto.form.EpdcAppScanVersionNumDTO
+     * @author qushutong
+     * @date 2019/10/10 12:01
+     */
+    EpdcAppScanFlagDTO selectOneOfScanInfo(EpdcAppScanVersionNumDTO scanVersionNumDTO);
+	
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java

@@ -18,13 +18,10 @@
 package com.elink.esua.epdc.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 扫码开关
  *
@@ -42,6 +39,21 @@ public class ScanSwitchEntity extends BaseEpdcEntity {
     /**
 	 * 扫码开关 0关1开
 	 */
-	private String scanSwitch;
+	private int scanFlag;
+
+	/**
+	 * 维护状态 0关1开
+	 */
+	private int maintainFlag;
+
+	/**
+	 * 版本号
+	 */
+	private String versionNum;
+
+	/**
+	 * 维护信息
+	 */
+	private String maintainInfo;
 
 }

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

@@ -47,28 +47,6 @@ public interface UserFeignClient {
     @GetMapping("app-user/epdc-app/user/getById/{userId}")
     Result<UserDTO> getUserInfoById(@PathVariable("userId") String userId);
 
-    /**
-     * 获取用户信息（登录用）
-     *
-     * @param openId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
-     * @author work@yujt.net.cn
-     * @date 2019/9/20 18:43
-     */
-    @GetMapping("app-user/epdc-app/user/getForLogin/{openId}")
-    Result<UserDTO> getUserForLoginByOpenId(@PathVariable("openId") String openId);
-
-    /**
-     * 获取用户信息
-     *
-     * @param unionId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
-     * @author yujintao
-     * @date 2019/9/7 11:04
-     */
-    @GetMapping("app-user/epdc-app/user/getByUnionId/{unionId}")
-    Result<UserDTO> getUserInfoByUnionId(@PathVariable("unionId") String unionId);
-
     /**
      * 用户注册
      *
@@ -338,4 +316,14 @@ public interface UserFeignClient {
      */
     @GetMapping("app-user/epdc-app/user/invitationRecord")
     Result<List<UserInvitationRecordResultDTO>> invitationRecord();
+
+    /**
+     * @param formDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     * @Author yinzuomei
+     * @Description 根据openId或者unionId查询用户信息
+     * @Date 2019/12/7 14:11
+     **/
+    @PostMapping(value="app-user/epdc-app/user/queryUserDto", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<UserDTO> queryUserDto(EpdcAppQueryUserInfoFormDTO formDTO);
 }

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

@@ -31,16 +31,6 @@ public class UserFeignClientFallback implements UserFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserInfoById", userId);
     }
 
-    @Override
-    public Result<UserDTO> getUserForLoginByOpenId(String openId) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserForLoginByOpenId", openId);
-    }
-
-    @Override
-    public Result<UserDTO> getUserInfoByUnionId(String unionId) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserInfoByUnionId", unionId);
-    }
-
     @Override
     public Result userRegist(UserDTO userDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "userRegist", userDto);
@@ -164,4 +154,9 @@ public class UserFeignClientFallback implements UserFeignClient {
     public Result<List<UserInvitationRecordResultDTO>> invitationRecord() {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "invitationRecord");
     }
+
+    @Override
+    public Result<UserDTO> queryUserDto(EpdcAppQueryUserInfoFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "queryUserDto",formDTO);
+    }
 }

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

@@ -208,4 +208,12 @@ public interface AppUserService {
      */
     Result<List<UserInvitationRecordResultDTO>> invitationRecord();
 
+    /**
+     * @param tokenDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 查看用户是否已保存unionId
+     * @Date 2019/12/7 14:32
+     **/
+	Result checkWxUnionId(TokenDto tokenDto);
 }

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

@@ -20,6 +20,8 @@ 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.ScanSwitchDTO;
+import com.elink.esua.epdc.dto.form.EpdcAppScanVersionNumDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppScanFlagDTO;
 import com.elink.esua.epdc.entity.ScanSwitchEntity;
 
 import java.util.List;
@@ -97,9 +99,9 @@ public interface ScanSwitchService extends BaseService<ScanSwitchEntity> {
     /***
      * 前端获取开关
      * @param
-     * @return com.elink.esua.epdc.dto.ScanSwitchDTO
+     * @return com.elink.esua.epdc.dto.form.EpdcAppScanVersionNumDTO
      * @author qushutong
      * @date 2019/10/10 12:01
      */
-    Map<String,String>  getOne();
+    EpdcAppScanFlagDTO getOneScanInfo(EpdcAppScanVersionNumDTO scanVersionNumDTO);
 }

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

@@ -100,17 +100,19 @@ public class AppUserServiceImpl implements AppUserService {
 
     @Override
     public Result<EpdcAppAuthorizationDTO> getMpToken(EpdcAppUserTokenFormDTO formDto) {
-        return this.getTokenByOpenId(this.getWxMpUser(formDto.getWxCode()).getOpenId());
+        return this.getTokenByOpenId(this.getWxMaUser(formDto.getWxCode()));
     }
 
     @Override
     public Result<EpdcAppAuthorizationDTO> getMaToken(EpdcAppUserMaTokenFormDTO formDto) {
-        return this.getTokenByOpenId(this.getWxMaUser(formDto.getWxCode()).getOpenid());
+        return this.getTokenByOpenId(this.getWxMaUser(formDto.getWxCode()));
     }
 
     @Override
     public Result<EpdcAppAuthorizationDTO> checkRegister(EpdcCheckRegisterFormDTO formDto) {
-        return this.getTokenByOpenId(formDto.getOpenId());
+        WxMaJscode2SessionResult wxMaJscode2SessionResult = new WxMaJscode2SessionResult();
+        wxMaJscode2SessionResult.setOpenid(formDto.getOpenId());
+        return this.getTokenByOpenId(wxMaJscode2SessionResult);
     }
 
     @Override
@@ -187,14 +189,17 @@ public class AppUserServiceImpl implements AppUserService {
     /**
      * 根据openId登录
      *
-     * @param openId
+     * @param wxMaJscode2SessionResult
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO>
      * @author work@yujt.net.cn
      * @date 2019/9/20 18:46
      */
-    private Result<EpdcAppAuthorizationDTO> getTokenByOpenId(String openId) {
+    private Result<EpdcAppAuthorizationDTO> getTokenByOpenId(WxMaJscode2SessionResult wxMaJscode2SessionResult) {
         // 查询当前微信是否已注册用户
-        Result<UserDTO> userInfoResult = userFeignClient.getUserForLoginByOpenId(openId);
+        EpdcAppQueryUserInfoFormDTO formDTO = new EpdcAppQueryUserInfoFormDTO();
+        formDTO.setOpenId(wxMaJscode2SessionResult.getOpenid());
+        formDTO.setUnionId(wxMaJscode2SessionResult.getUnionid());
+        Result<UserDTO> userInfoResult = userFeignClient.queryUserDto(formDTO);
         if (!userInfoResult.success()) {
             return new Result().error(userInfoResult.getMsg());
         }
@@ -636,7 +641,7 @@ public class AppUserServiceImpl implements AppUserService {
         authorization.setGrid(grid);
 
         // 暂用，部署生产环境时删除
-        redisUtils.set("epdc:sys:security:cpuser:token:" + userId, token);
+        // redisUtils.set("epdc:sys:security:cpuser:token:" + userId, token);
 
         return authorization;
     }
@@ -664,6 +669,7 @@ public class AppUserServiceImpl implements AppUserService {
         // 查询当前微信注册状态
         EpdcCheckUserRegisterFromDTO checkFromDto = new EpdcCheckUserRegisterFromDTO();
         checkFromDto.setOpenId(openId);
+        checkFromDto.setWxUnionId(unionId);
         checkFromDto.setGridId(formDto.getGridId());
         Result<EpdcUserRegisterInfoResultDTO> userResult = userFeignClient.getUserRegisterState(checkFromDto);
         if (!userResult.success()) {
@@ -762,6 +768,15 @@ public class AppUserServiceImpl implements AppUserService {
         UserDTO userDto = ConvertUtils.sourceToTarget(infoDto, UserDTO.class);
         userDto.setId(tokenDto.getUserId());
 
+        if (StringUtils.isNotBlank(infoDto.getWxCode())) {
+            String sessionKey = this.getUserSessionKey(infoDto.getWxCode());
+            WxMaUserInfo wxMaUserInfo = wxMaServiceUtils.normalWxMaService().getUserService().getUserInfo(sessionKey, infoDto.getEncryptedData(), infoDto.getIv());
+            if (StringUtils.isBlank(wxMaUserInfo.getUnionId())) {
+                return new Result().error("解析微信开放平台ID失败");
+            }
+            userDto.setWxUnionId(wxMaUserInfo.getUnionId());
+        }
+
         // 党员提交，验证身份证号
         if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) {
             String identityNo = userDto.getIdentityNo();
@@ -978,4 +993,27 @@ public class AppUserServiceImpl implements AppUserService {
     public Result<List<UserInvitationRecordResultDTO>> invitationRecord() {
         return userFeignClient.invitationRecord();
     }
+
+    /**
+     * @param tokenDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 查看用户是否已保存unionId
+     * @Date 2019/12/7 14:32
+     * data:0 无unionId  1:有unionId
+     **/
+    @Override
+    public Result checkWxUnionId(TokenDto tokenDto) {
+        Result result = new Result();
+        Result<UserDTO> userDTOResult = userFeignClient.getUserInfoById(tokenDto.getUserId());
+        if (!userDTOResult.success() || null == userDTOResult.getData()) {
+            throw new RenException("查询用户信息失败");
+        }
+        if (StringUtils.isNotBlank(userDTOResult.getData().getWxUnionId())) {
+            result.setData(YesOrNoEnum.YES.value());
+        } else {
+            result.setData(YesOrNoEnum.NO.value());
+        }
+        return result;
+    }
 }

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

@@ -69,9 +69,9 @@ public class MessageServiceImpl implements MessageService {
     public Result sendSmsCode(String mobile) {
         String smsCodeKey = RedisKeys.getPhoneSmsHistoryKey(mobile);
         if (null != redisUtils.get(smsCodeKey)) {
-            redisUtils.set(smsCodeKey, System.currentTimeMillis(), RedisUtils.MINUTE_ONE_EXPIRE);
             return new Result().error("操作频繁，请稍后重试");
         }
+        redisUtils.set(smsCodeKey, System.currentTimeMillis(), RedisUtils.MINUTE_ONE_EXPIRE);
         return messageFeignClient.sendCode(mobile);
     }
 

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

@@ -20,11 +20,13 @@ package com.elink.esua.epdc.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.dao.ScanSwitchDao;
 import com.elink.esua.epdc.dto.ScanSwitchDTO;
+import com.elink.esua.epdc.dto.form.EpdcAppScanVersionNumDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppScanFlagDTO;
 import com.elink.esua.epdc.entity.ScanSwitchEntity;
 import com.elink.esua.epdc.service.ScanSwitchService;
 import org.apache.commons.lang3.StringUtils;
@@ -33,7 +35,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -101,13 +102,8 @@ public class ScanSwitchServiceImpl extends BaseServiceImpl<ScanSwitchDao, ScanSw
     }
 
     @Override
-    public Map<String,String> getOne() {
+    public EpdcAppScanFlagDTO getOneScanInfo(EpdcAppScanVersionNumDTO scanVersionNumDTO) {
-        QueryWrapper<ScanSwitchEntity> wrapper = new QueryWrapper<>();
+        return baseDao.selectOneOfScanInfo(scanVersionNumDTO);
-        wrapper.orderByDesc("updated_time");
-        ScanSwitchEntity scanSwitchEntity = baseDao.selectOne(wrapper);
-        Map<String,String> map=new HashMap<>();
-        map.put("switch",scanSwitchEntity.getScanSwitch());
-        return map;
     }
 
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ScanSwitchDao.xml

@@ -5,7 +5,10 @@
 
     <resultMap type="com.elink.esua.epdc.entity.ScanSwitchEntity" id="scanSwitchMap">
         <result property="id" column="id"/>
-        <result property="scan_switch" column="scanSwitch"/>
+        <result property="versionNum" column="version_num"/>
+        <result property="scanFlag" column="scan_flag"/>
+        <result property="maintainFlag" column="maintain_flag"/>
+        <result property="maintainInfo" column="maintain_info"/>
         <result property="delFlag" column="del_flag"/>
         <result property="creatdeBy" column="creatde_by"/>
         <result property="createDate" column="create_time"/>
@@ -13,5 +16,9 @@
         <result property="updateDate" column="update_time"/>
     </resultMap>
 
+    <select id="selectOneOfScanInfo" resultType="com.elink.esua.epdc.dto.result.EpdcAppScanFlagDTO">
+        SELECT scan_flag, maintain_flag, maintain_info FROM `epdc_scan_switch` WHERE del_flag = '0' AND version_num = #{versionNum} ORDER BY updated_time DESC LIMIT 1
+    </select>
+
 
 </mapper>

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf

@@ -14,7 +14,7 @@ config {
   type = "nacos"
 
   nacos {
-    serverAddr = "nacos.server-addr"
+    serverAddr = "@nacos.server-addr@"
     namespace = "public"
     cluster = "default"
   }

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

@@ -345,7 +345,7 @@
             COUNT( issue.ID ) AS issueNum,
             SUM( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.BROWSE_NUM + eve.COMMENT_NUM ) AS attitudeNum,
             cate.CATEGORY_NAME,
-            cate.ID AS categoryCode
+            cate.CATEGORY_CODE AS categoryCode
         FROM
             epdc_issue issue
             LEFT JOIN epdc_events eve ON issue.EVENT_ID = eve.ID

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

@@ -37,6 +37,9 @@
         item.USER_FACE,
         item.IS_PARTY_MEMBER,
         item.CREATED_TIME,
+        eve.APPROVE_NUM,
+        eve.OPPOSE_NUM,
+        eve.COMMENT_NUM,
         ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS statementNum,
         cate.CATEGORY_NAME,
         img.IMG_URL,

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java

@@ -70,7 +70,8 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
 
     @Override
     public PageData<NoticeDTO> page(Map<String, Object> params) {
-
+        String noticeTitle= (String) params.get("noticeTitle");
+        params.put("noticeTitle",noticeTitle.trim());
         QueryWrapper<NoticeEntity> wrapper = this.getWrapper(params)
                 .eq(FieldConstant.CREATED_BY, SecurityUser.getUserId());
 
@@ -135,8 +136,6 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
     private void saveOrUpdate(NoticeDTO dto) {
         UserDetail user = SecurityUser.getUser();
         dto.setCreatorName(user.getRealName());
-        dto.setDeptId(user.getDeptId());
-        dto.setDeptName(user.getDeptName());
         NoticeEntity entity = ConvertUtils.sourceToTarget(dto, NoticeEntity.class);
 
         List<String> allDeptIds = dto.getAllDeptIdsShow();
@@ -154,6 +153,12 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
                 entity.setAllDeptNames(deptDTO.getAllDeptNames());
                 entity.setParentDeptIds(deptDTO.getParentDeptIds());
                 entity.setParentDeptNames(deptDTO.getParentDeptNames());
+                //赋值deptid  name 最小组织
+                String[] newAllDeptIds=deptDTO.getAllDeptIds().split(",");
+                entity.setDeptId(Long.parseLong(newAllDeptIds[newAllDeptIds.length-1]));
+
+                String[] newAllDeptNames=deptDTO.getAllDeptNames().split("-");
+                entity.setDeptName(newAllDeptNames[newAllDeptNames.length-1]);
             }
         }else {
             throw new RenException("所属部门不能为空");

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml

@@ -32,7 +32,7 @@
             n.NOTICE_CONTENT AS noticeContent,
             n.READING_AMOUNT AS readingAmount,
             n.RELEASE_TIME AS noticeTime,
-            SUBSTRING_INDEX(en.ALL_DEPT_NAMES,'-',-1) AS deptName
+            SUBSTRING_INDEX(n.ALL_DEPT_NAMES,'-',-1) AS deptName
         FROM
             epdc_notice n
         WHERE
@@ -49,7 +49,9 @@
             parent_dept_ids = #{parentDeptIds},
             parent_dept_names = #{parentDeptNames},
             updated_by = #{updatedBy},
-            updated_time = #{updatedTime}
+            updated_time = #{updatedTime},
+            dept_id=#{deptId},
+            dept_name=#{deptName}
         WHERE id = #{id} AND del_flag = '0'
     </update>
 </mapper>

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java

@@ -94,4 +94,9 @@ public class EpdcCompleteAppUserDTO implements Serializable {
      */
     private String state;
 
+    /**
+     * 微信unionId
+     */
+    private String wxUnionId;
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppQueryUserInfoFormDTO.java

@@ -0,0 +1,20 @@
+package com.elink.esua.epdc.dto.epdc.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 获取用户信息入参DTO
+ * @Author yinzuomei
+ * @Date 2019/12/7 13:55
+ */
+@Data
+public class EpdcAppQueryUserInfoFormDTO implements Serializable {
+	private static final long serialVersionUID = 7818827219206113924L;
+
+	private String openId;
+
+
+	private String unionId;
+}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCheckUserRegisterFromDTO.java

@@ -17,6 +17,11 @@ public class EpdcCheckUserRegisterFromDTO implements Serializable {
      */
     private String openId;
 
+    /**
+     * 微信unionId
+     */
+    private String wxUnionId;
+
     /**
      * 网格ID
      */

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java

@@ -90,6 +90,18 @@ public class EpdcAppUserController {
         return userService.getUserInfoByUnionId(unionId);
     }
 
+    /**
+     * @param formDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     * @Author yinzuomei
+     * @Description 获取用户信息 合并上面的getByUnionId、getForLogin方法
+     * @Date 2019/12/7 13:57
+     **/
+    @PostMapping("queryUserDto")
+    public Result<UserDTO> queryUserDto(@RequestBody EpdcAppQueryUserInfoFormDTO formDTO) {
+        return userService.queryUserDto(formDTO);
+    }
+
     /**
      * 移动端用户注册
      *

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

@@ -250,4 +250,12 @@ public interface UserService extends BaseService<UserEntity> {
      */
     Result<EpdcUserRegisterInfoResultDTO> getUserLastSwitchGird(String openId);
 
+    /**
+     * @param formDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     * @Author yinzuomei
+     * @Description 获取用户信息 合并上面的getByUnionId、getForLogin方法
+     * @Date 2019/12/7 13:58
+     **/
+    Result<UserDTO> queryUserDto(EpdcAppQueryUserInfoFormDTO formDTO);
 }

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

@@ -92,6 +92,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     private AdminFeignClient adminFeignClient;
     @Autowired
     private PartyAuthenticationFailedDao partyAuthenticationFailedDao;
+
     @Override
     public PageData<UserDTO> page(Map<String, Object> params) {
         this.verifyParams(params);
@@ -363,22 +364,24 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
     @Override
     public Result<EpdcUserRegisterInfoResultDTO> checkUserRegisterState(EpdcCheckUserRegisterFromDTO fromDto) {
-        QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
+
-        wrapper.eq(UserFieldConsant.WX_OPEN_ID, fromDto.getOpenId())
+        UserDTO userDto = this.selectUserByWxInfo(fromDto.getOpenId(), fromDto.getWxUnionId());
-                .select(FieldConstant.ID, UserFieldConsant.NICKNAME, UserFieldConsant.FACE_IMG,
+
-                        FieldConstant.MOBILE, UserFieldConsant.REAL_NAME,
+//        QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
-                        FieldConstant.STATE, UserFieldConsant.PARTY_FLAG, UserFieldConsant.REMARK)
+//        wrapper.eq(UserFieldConsant.WX_OPEN_ID, fromDto.getOpenId())
-                .orderByDesc(FieldConstant.CREATED_TIME);
+//                .select(FieldConstant.ID, UserFieldConsant.NICKNAME, UserFieldConsant.FACE_IMG,
-        List<UserEntity> userEntityList = this.baseDao.selectList(wrapper);
+//                        FieldConstant.MOBILE, UserFieldConsant.REAL_NAME,
+//                        FieldConstant.STATE, UserFieldConsant.PARTY_FLAG, UserFieldConsant.REMARK)
+//                .orderByDesc(FieldConstant.CREATED_TIME);
+//        List<UserEntity> userEntityList = this.baseDao.selectList(wrapper);
 
         EpdcUserRegisterInfoResultDTO resultDto = new EpdcUserRegisterInfoResultDTO();
         resultDto.setGridId(fromDto.getGridId());
         // 已注册
-        if (CollUtil.isNotEmpty(userEntityList) && null != userEntityList.get(NumConstant.ZERO)) {
+        if (null != userDto) {
-            UserEntity userEntity = userEntityList.get(NumConstant.ZERO);
+            resultDto.setUserDTO(userDto);
-            resultDto.setUserDTO(ConvertUtils.sourceToTarget(userEntity, UserDTO.class));
             // 获取用户关联当前网格信息
-            UserGridRelationDTO relationInfo = userGridRelationService.getUserRelationInfo(userEntity.getId(), fromDto.getGridId());
+            UserGridRelationDTO relationInfo = userGridRelationService.getUserRelationInfo(userDto.getId(), fromDto.getGridId());
             // 未绑定当前网格
             if (null == relationInfo) {
                 resultDto.setRegisterState(NumConstant.ONE);
@@ -421,11 +424,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         }
         userGridRel.setUserId(formUserDto.getId());
         //修改数据库结构
-//        userGridRel.setAllDeptNames(formUserDto.getStreet() + "-" + formUserDto.getCommunity() + "-" + formUserDto.getGrid());
+        Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(userGridRel.getGridId().toString());
-//        userGridRel.setAllDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId() + "," + formUserDto.getGridId());
-//        userGridRel.setParentDeptNames(formUserDto.getStreet() + "-" + formUserDto.getCommunity());
-//        userGridRel.setParentDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId());
-        Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult=adminFeignClient.getParentAndAllDept(userGridRel.getGrid());
         if (!parentAndAllDeptDTOResult.success()) {
             return new Result<EpdcUserRegisterInfoResultDTO>().error(parentAndAllDeptDTOResult.getMsg());
         }
@@ -496,6 +495,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         EpdcCompleteAppUserDTO completeAppUser = formDto.getCompleteAppUser();
 
         UserDTO userDto = ConvertUtils.sourceToTarget(completeAppUser, UserDTO.class);
+        if (StringUtils.isBlank(userDto.getWxUnionId())) {
+            userDto.setWxUnionId(null);
+        }
         UserGridRelationDTO userGridRelation = formDto.getUserGridRelation();
 
         String userId = userDto.getId();
@@ -505,11 +507,21 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         String identityNo = userDto.getIdentityNo();
         if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) {
             PartyMembersEntity partyMembersEntity = new PartyMembersEntity();
-            //修改数据库结构
+
-            partyMembersEntity.setAllDeptNames(userGridRelation.getStreet() + "-" + userGridRelation.getCommunity() + "-" + userGridRelation.getGrid());
+            Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(String.valueOf(userGridRelation.getGridId()));
-            partyMembersEntity.setAllDeptIds(userGridRelation.getStreetId() + "," + userGridRelation.getCommunityId() + "," + userGridRelation.getGridId());
+            if (!parentAndAllDeptDTOResult.success()) {
-            partyMembersEntity.setParentDeptNames(userGridRelation.getStreet() + "-" + userGridRelation.getCommunity());
+                return new Result<UserDTO>().error(parentAndAllDeptDTOResult.getMsg());
-            partyMembersEntity.setParentDeptIds(userGridRelation.getStreetId() + "," + userGridRelation.getCommunityId());
+            }
+            partyMembersEntity.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames());
+            partyMembersEntity.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds());
+            partyMembersEntity.setParentDeptNames(parentAndAllDeptDTOResult.getData().getParentDeptNames());
+            partyMembersEntity.setParentDeptIds(parentAndAllDeptDTOResult.getData().getParentDeptIds());
+
+//            //修改数据库结构
+//            partyMembersEntity.setAllDeptNames(userGridRelation.getStreet() + "-" + userGridRelation.getCommunity() + "-" + userGridRelation.getGrid());
+//            partyMembersEntity.setAllDeptIds(userGridRelation.getStreetId() + "," + userGridRelation.getCommunityId() + "," + userGridRelation.getGridId());
+//            partyMembersEntity.setParentDeptNames(userGridRelation.getStreet() + "-" + userGridRelation.getCommunity());
+//            partyMembersEntity.setParentDeptIds(userGridRelation.getStreetId() + "," + userGridRelation.getCommunityId());
 
             partyMembersEntity.setGridId(userGridRelation.getGridId());
             partyMembersEntity.setGridName(userGridRelation.getGrid());
@@ -611,25 +623,25 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         if (StringUtils.isBlank(formDTO.getAuthenticatedFlag())) {
             formDTO.setAuthenticatedFlag(YesOrNoEnum.NO.value());
         }
-        UserDTO userDTO = this.get(formDTO.getUserId());
+        UserDTO userDto = this.get(formDTO.getUserId());
-        if (null != userDTO) {
+        if (null != userDto) {
-            userDTO.setRemark(formDTO.getRemark());//审核不通过的原因 - 2019.12.05.zy
+            userDto.setRemark(formDTO.getRemark());//审核不通过的原因 - 2019.12.05.zy
             if (YesOrNoEnum.NO.value().equals(formDTO.getAuthenticatedFlag())) {//不通过
-                userDTO.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value());
+                userDto.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value());
             } else if (YesOrNoEnum.YES.value().equals(formDTO.getAuthenticatedFlag())) {//通过
-                userDTO.setState(AppUserStatesEnum.STATE_INFORMATION_PASSED.value());
+                userDto.setState(AppUserStatesEnum.STATE_INFORMATION_PASSED.value());
             } else {
                 throw new RenException("是否认证通过数据不匹配");
             }
-            this.update(userDTO);
+            this.update(userDto);
             //插入认证历史表
             UserAuthenticateHistoryEntity authenticateHistoryEntity = new UserAuthenticateHistoryEntity();
-            authenticateHistoryEntity.setUserId(userDTO.getId());
+            authenticateHistoryEntity.setUserId(userDto.getId());
-            authenticateHistoryEntity.setMobile(userDTO.getMobile());
+            authenticateHistoryEntity.setMobile(userDto.getMobile());
-            authenticateHistoryEntity.setRealName(userDTO.getRealName());
+            authenticateHistoryEntity.setRealName(userDto.getRealName());
-            authenticateHistoryEntity.setAddress(userDTO.getAddress());
+            authenticateHistoryEntity.setAddress(userDto.getAddress());
             authenticateHistoryEntity.setAuthenticatedFlag(formDTO.getAuthenticatedFlag());//是否认证通过 0未通过1通过
-            //authenticateHistoryEntity.setRemark(userDTO.getRemark());
+            //authenticateHistoryEntity.setRemark(userDto.getRemark());
             authenticateHistoryEntity.setRemark(formDTO.getRemark()); //审核不通过的原因 - 2019.12.05.zy
             userAuthenticateHistoryDao.insert(authenticateHistoryEntity);
         }
@@ -722,4 +734,56 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         return new Result<EpdcUserRegisterInfoResultDTO>().ok(resultDto);
     }
 
+    /**
+     * @param formDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     * @Author yinzuomei
+     * @Description 获取用户信息 合并上面的getByUnionId、getForLogin方法
+     * @Date 2019/12/7 13:58
+     **/
+    @Override
+    public Result<UserDTO> queryUserDto(EpdcAppQueryUserInfoFormDTO formDTO) {
+        UserDTO userDto = this.selectUserByWxInfo(formDTO.getOpenId(), formDTO.getUnionId());
+        if (null != userDto) {
+            QueryWrapper<UserGridRelationEntity> ugWrapper = new QueryWrapper<>();
+            ugWrapper.eq(UserFieldConsant.USER_ID, userDto.getId())
+                    .orderByDesc(UserFieldConsant.SWITCHED_TIME);
+            List<UserGridRelationDTO> gridRelations = userGridRelationService.listUserGrid(userDto.getId());
+            if (CollUtil.isNotEmpty(gridRelations)) {
+                userDto.setGridId(gridRelations.get(NumConstant.ZERO).getGridId());
+                userDto.setGrid(gridRelations.get(NumConstant.ZERO).getGrid());
+                return new Result<UserDTO>().ok(userDto);
+            }
+        }
+        return new Result();
+    }
+
+    /**
+     * 根据微信信息查询用户
+     *
+     * @param openId
+     * @param unionId
+     * @return com.elink.esua.epdc.dto.UserDTO
+     * @author work@yujt.net.cn
+     * @date 2019/12/7 17:19
+     */
+    private UserDTO selectUserByWxInfo(String openId, String unionId) {
+        if (StringUtils.isBlank(openId)) {
+            throw new RenException("openId不能为空");
+        }
+        QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
+        UserEntity userEntity = null;
+        if (StringUtils.isNotBlank(unionId)) {
+            wrapper.eq(UserFieldConsant.WX_UNION_ID, unionId);
+            userEntity = this.baseDao.selectOne(wrapper);
+        }
+        if (null == userEntity) {
+            wrapper = new QueryWrapper<>();
+            wrapper.eq(UserFieldConsant.WX_OPEN_ID, openId)
+                    .orderByDesc(FieldConstant.CREATED_TIME);
+            userEntity = this.baseDao.selectOne(wrapper);
+        }
+        return ConvertUtils.sourceToTarget(userEntity, UserDTO.class);
+    }
+
 }