Merge remote-tracking branch 'origin/master' into feature/syp_moduleMaCode

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppSysDictResultDTO.java

@@ -0,0 +1,48 @@
+package com.elink.esua.epdc.dto.epdc.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 数据字典信息
+ */
+@Data
+public class EpdcAppSysDictResultDTO implements Serializable {
+    private static final long serialVersionUID = -4403370952559152606L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 上级ID，一级为0
+     */
+    private Long pid;
+
+    /**
+     * 字典类型
+     */
+    private String dictType;
+
+    /**
+     * 字典名称
+     */
+    private String dictName;
+
+    /**
+     * 字典值
+     */
+    private String dictValue;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDictController.java

@@ -20,6 +20,7 @@ import com.elink.esua.epdc.dto.SysDictDTO;
 import com.elink.esua.epdc.dto.SysPopulationSimpleDictDTO;
 import com.elink.esua.epdc.dto.SysSimpleDictDTO;
 import com.elink.esua.epdc.dto.epdc.form.SysPopulationSimpleDictFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO;
 import com.elink.esua.epdc.service.SysDictService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -145,6 +146,21 @@ public class SysDictController {
         return sysDictService.listSimpleDictInfo(dictType);
     }
 
+    /**
+     * 根据数据字典类型获取详细数据字典列表
+     *
+     * @param dictType
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO>>
+     * @author Liuchuang
+     * @since 2020/10/12 9:27
+     */
+    @GetMapping("listFull/{dictType}")
+    @ApiOperation("字典分类数据")
+    public Result<List<EpdcAppSysDictResultDTO>> listFullDictInfo(@PathVariable("dictType") String dictType) {
+        //字典分类数据
+        return sysDictService.listFullDictInfo(dictType);
+    }
+
     @PostMapping("listPopulationSimple")
     public Result<List<SysPopulationSimpleDictDTO>> listPopulationSimple(@RequestBody SysPopulationSimpleDictFormDTO sysPopulationSimpleDictFormDTO) {
         //字典分类数据

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/redis/SysDictRedis.java

@@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.tools.redis.RedisKeys;
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import com.elink.esua.epdc.dto.SimpleAreaDTO;
 import com.elink.esua.epdc.dto.SysSimpleDictDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -51,6 +52,19 @@ public class SysDictRedis {
         return (List<SysSimpleDictDTO>) redisUtils.get(dictKey);
     }
 
+    /**
+     * 根据数据字典类型，从redis获取详细数据字典列表
+     *
+     * @param dictType 数据字典类型
+     * @return java.util.List<com.elink.esua.dto.epdc.result.EpdcAppSysDictResultDTO>
+     * @author yujintao
+     * @date 2019/7/15 09:42
+     */
+    public List<EpdcAppSysDictResultDTO> getFullDictList(String dictType) {
+        String dictKey = RedisKeys.getFullDictKey(dictType);
+        return (List<EpdcAppSysDictResultDTO>) redisUtils.get(dictKey);
+    }
+
     /**
      * 根据数据字典类型，将简版数据字典列表放入缓存
      *
@@ -65,6 +79,20 @@ public class SysDictRedis {
         redisUtils.set(dictKey, simpleDictList);
     }
 
+    /**
+     * 根据数据字典类型，将详细数据字典列表放入缓存
+     *
+     * @param dictType       数据字典类型
+     * @param fullDictList 列表
+     * @return void
+     * @author yujintao
+     * @date 2019/7/15 09:50
+     */
+    public void setFullDictList(String dictType, List<EpdcAppSysDictResultDTO> fullDictList) {
+        String dictKey = RedisKeys.getFullDictKey(dictType);
+        redisUtils.set(dictKey, fullDictList);
+    }
+
     /**
      * 根据数据字典类型，从redis删除简版数据字典列表
      *
@@ -75,7 +103,9 @@ public class SysDictRedis {
      */
     public void removeSimpleDictList(String dictType) {
         String dictKey = RedisKeys.getSimpleDictKey(dictType);
+        String fullDictKey = RedisKeys.getFullDictKey(dictType);
         redisUtils.delete(dictKey);
+        redisUtils.delete(fullDictKey);
     }
 
 }

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

@@ -15,6 +15,7 @@ import com.elink.esua.epdc.dto.SysDictDTO;
 import com.elink.esua.epdc.dto.SysPopulationSimpleDictDTO;
 import com.elink.esua.epdc.dto.SysSimpleDictDTO;
 import com.elink.esua.epdc.dto.epdc.form.SysPopulationSimpleDictFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO;
 import com.elink.esua.epdc.entity.SysDictEntity;
 
 import java.util.List;
@@ -52,6 +53,16 @@ public interface SysDictService extends BaseService<SysDictEntity> {
      */
     Result<List<SysSimpleDictDTO>> listSimpleDictInfo(String dictType);
 
+    /**
+     * 根据数据字典类型获取详细数据字典列表
+     *
+     * @param dictType
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO>>
+     * @author Liuchuang
+     * @since 2020/10/12 9:25
+     */
+    Result<List<EpdcAppSysDictResultDTO>> listFullDictInfo(String dictType);
+
     /**
      * 根据ID删除
      *

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

@@ -12,6 +12,7 @@ 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.Constant;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 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.utils.Result;
@@ -20,6 +21,7 @@ import com.elink.esua.epdc.dto.SysDictDTO;
 import com.elink.esua.epdc.dto.SysPopulationSimpleDictDTO;
 import com.elink.esua.epdc.dto.SysSimpleDictDTO;
 import com.elink.esua.epdc.dto.epdc.form.SysPopulationSimpleDictFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO;
 import com.elink.esua.epdc.entity.SysDictEntity;
 import com.elink.esua.epdc.redis.SysDictRedis;
 import com.elink.esua.epdc.service.SysDictService;
@@ -193,4 +195,35 @@ public class SysDictServiceImpl extends BaseServiceImpl<SysDictDao, SysDictEntit
         }
         return new Result<List<SysSimpleDictDTO>>().ok(simpleDictList);
     }
+
+    @Override
+    public Result<List<EpdcAppSysDictResultDTO>> listFullDictInfo(String dictType) {
+        List<EpdcAppSysDictResultDTO> fullDictList = Lists.newArrayList();
+
+        try {
+            if (StringUtils.isNotBlank(dictType)) {
+
+                List<EpdcAppSysDictResultDTO> dictList = dictRedis.getFullDictList(dictType);
+                if (null != dictList) {
+                    return new Result<List<EpdcAppSysDictResultDTO>>().ok(dictList);
+                }
+
+                QueryWrapper<SysDictEntity> sdWrapper = new QueryWrapper<>();
+                sdWrapper.select("id", "pid", "dict_type", "dict_value", "dict_name", "remark", "sort");
+                sdWrapper.eq("dict_type", dictType);
+                sdWrapper.eq(Constant.DEL_FLAG, NumConstant.ZERO);
+                sdWrapper.ne("dict_value", "");
+                sdWrapper.isNotNull("dict_value");
+                sdWrapper.orderByAsc("SORT", Constant.CREATE_DATE);
+                List<SysDictEntity> entityList = baseDao.selectList(sdWrapper);
+                if (!entityList.isEmpty()) {
+                    fullDictList = ConvertUtils.sourceToTarget(entityList, EpdcAppSysDictResultDTO.class);
+                    dictRedis.setFullDictList(dictType, fullDictList);
+                }
+            }
+        } catch (Exception e) {
+            log.error("获取数据字典列表失败，错误信息{}", e.getMessage());
+        }
+        return new Result<List<EpdcAppSysDictResultDTO>>().ok(fullDictList);
+    }
 }

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java

@@ -103,6 +103,18 @@ public class RedisKeys {
         return rootPrefix.concat("config:simple:dict:").concat(dictType);
     }
 
+    /**
+     * 获取详细数据字典key
+     *
+     * @param dictType 数据字典类型
+     * @return java.lang.String
+     * @author yujintao
+     * @date 2019/9/3 16:28
+     */
+    public static String getFullDictKey(String dictType) {
+        return rootPrefix.concat("config:full:dict:").concat(dictType);
+    }
+
     /**
      * 拼接手机验证码key
      *

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

@@ -1,12 +1,17 @@
 package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO;
 import com.elink.esua.epdc.service.AdminService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 字典
  * @Auther: zhangyong
@@ -19,7 +24,7 @@ public class ApiDicController {
     @Autowired
     private AdminService adminService;
 
-    /*
+    /**
      * 获取默认网格信息
      * @param
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
@@ -31,4 +36,17 @@ public class ApiDicController {
         String dicType = "default_grid";
         return adminService.getDefaultGridInfo(dicType);
     }
+
+    /**
+     * 获取字典信息
+     *
+     * @param dictType
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     * @author Liuchuang
+     * @since 2020/10/12 9:34
+     */
+    @GetMapping("/getFullDictInfo/{dictType}")
+    public Result<List<EpdcAppSysDictResultDTO>> getFullDictInfo(@PathVariable("dictType") String dictType) {
+        return adminService.listFullDictInfo(dictType);
+    }
 }

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

@@ -6,6 +6,7 @@ import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcScripUserInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO;
 import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
@@ -145,4 +146,15 @@ public interface AdminFeignClient {
      **/
     @PostMapping(value = "sys/user/getUserInfoByGridAndMobile", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<String> getUserInfoByGridAndMobile(@RequestBody EpdcScripUserInfoFormDTO epdcScripUserInfoFormDTO);
+
+    /**
+     * 获取字典信息
+     *
+     * @param dicType
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO>>
+     * @author Liuchuang
+     * @since 2020/10/12 9:39
+     */
+    @GetMapping("/sys/dict/listFull/{dictType}")
+    Result<List<EpdcAppSysDictResultDTO>> listFullDictInfo(@PathVariable("dictType") String dicType);
 }

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

@@ -7,8 +7,10 @@ import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcScripUserInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 
@@ -74,4 +76,9 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     public Result<String> getUserInfoByGridAndMobile(EpdcScripUserInfoFormDTO epdcScripUserInfoFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getUserInfoByGridAndMobile", epdcScripUserInfoFormDTO);
     }
+
+    @Override
+    public Result<List<EpdcAppSysDictResultDTO>> listFullDictInfo(String dicType) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listFullDictInfo", dicType);
+    }
 }

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

@@ -2,6 +2,9 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO;
+
+import java.util.List;
 
 /**
  * 管理端相关接口
@@ -22,7 +25,7 @@ public interface AdminService {
      */
     Result<String> getCompleteDeptName(Long gridId);
 
-    /*
+    /**
      * 根据字典类型 获取网格信息
      * @param dicType
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
@@ -38,4 +41,14 @@ public interface AdminService {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
      **/
     Result<String> getScrip(TokenDto userDetail);
+
+    /**
+     * 获取字典信息
+     *
+     * @param dicType
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO>>
+     * @author Liuchuang
+     * @since 2020/10/12 9:35
+     */
+    Result<List<EpdcAppSysDictResultDTO>> listFullDictInfo(String dicType);
 }

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

@@ -5,6 +5,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.SysSimpleDictDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcScripUserInfoFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.service.AdminService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,4 +60,9 @@ public class AdminServiceImpl implements AdminService {
         epdcScripUserInfoFormDTO.setMobile(userDetail.getMobile());
         return adminFeignClient.getUserInfoByGridAndMobile(epdcScripUserInfoFormDTO);
     }
+
+    @Override
+    public Result<List<EpdcAppSysDictResultDTO>> listFullDictInfo(String dicType) {
+        return adminFeignClient.listFullDictInfo(dicType);
+    }
 }

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

@@ -5,7 +5,6 @@ import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import cn.binarywang.wx.miniapp.util.crypt.WxMaCryptUtils;
-import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.elink.esua.epdc.async.GroupTask;
@@ -1543,7 +1542,7 @@ public class AppUserServiceImpl implements AppUserService {
         if(!userSignInfoResult.success()){
             return new Result().error("获取用户签到信息出错!");
         }
-        UserSignDTO userSignDTO = new UserSignDTO();
+        UserSignDTO userSignDTO;
         //不是空则进行签到信息校验
         if(userSignInfoResult.getData()!=null){
             userSignDTO =  userSignInfoResult.getData();
@@ -1552,7 +1551,7 @@ public class AppUserServiceImpl implements AppUserService {
             }
             userSignDTO.setConsequentSignDays(userSignDTO.getConsequentSignDays()+1);
             //判断签到日期是否是前天或者更前 若是前天或者更前则连续签到天数修改为1
-            if(DateUtil.between(userSignDTO.getLastSignTime(), new Date(), DateUnit.DAY) >= 2){
+            if(DateUtil.betweenDay(userSignDTO.getLastSignTime(), new Date(),true) >= 2){
                 userSignDTO.setConsequentSignDays(1);
             }
             userSignDTO.setLastSignTime(new Date());

esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml

@@ -154,7 +154,7 @@
                 <nacos.ip></nacos.ip>
                 <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
                 <!--RocketMQ-->
-                <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
+                <rocketmq.name.server>114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.producer.group>jinshui-pointsGroup</rocketmq.producer.group>
                 <rocketmq.consumer.points.group>jinshui-pointsGroup</rocketmq.consumer.points.group>
             </properties>
@@ -183,7 +183,7 @@
                 <nacos.ip>47.104.224.45</nacos.ip>
                 <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
                 <!--RocketMQ-->
-                <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
+                <rocketmq.name.server>114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.producer.group>jinshui-pointsGroup</rocketmq.producer.group>
                 <rocketmq.consumer.points.group>jinshui-pointsGroup</rocketmq.consumer.points.group>
             </properties>

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml

@@ -60,10 +60,10 @@
             and OPERATION_TIME between date_add(now() , interval  -1 hour ) and now()
         </if>
         <if test="operationFlag == 2">
-            and date_format(OPERATION_TIME,'%d') =  date_format(now(),'%d')
+            and date_format(OPERATION_TIME,'%Y-%m-%d') =  date_format(now(),'%Y-%m-%d')
         </if>
         <if test="operationFlag == 3">
-            and date_format(OPERATION_TIME,'%m') =  date_format(now(),'%m')
+            and date_format(OPERATION_TIME,'%Y-%m') =  date_format(now(),'%Y-%m')
         </if>
         <if test="operationFlag == 4">
             and date_format(OPERATION_TIME,'%Y') =  date_format(now(),'%Y')

esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml

@@ -149,7 +149,7 @@
                 <nacos.ip></nacos.ip>
                 <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
                 <!--RocketMQ-->
-                <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
+                <rocketmq.name.server>114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.consumer.group>jinshui-organizationGroup</rocketmq.consumer.group>
                 <rocketmq.producer.group>jinshui-pointsGroup</rocketmq.producer.group>
                 <rocketmq.consumer.points.group>jinshui-pointsGroup</rocketmq.consumer.points.group>
@@ -179,7 +179,7 @@
                 <nacos.ip>47.104.224.45</nacos.ip>
                 <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
                 <!--RocketMQ-->
-                <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
+                <rocketmq.name.server>114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.consumer.group>jinshui-organizationGroup</rocketmq.consumer.group>
                 <rocketmq.producer.group>jinshui-pointsGroup</rocketmq.producer.group>
                 <rocketmq.consumer.points.group>jinshui-pointsGroup</rocketmq.consumer.points.group>