Merge branch 'master' of http://113.105.137.151:22280/youjj/cloud-platform

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserPositionTempDTO.java

+package com.github.wxiaoqi.security.admin.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/9/23 16:51
+ */
+@Builder(toBuilder = true)
+@Data
+public class AppUserPositionTempDTO {
+
+    @ApiModelProperty("主键id")
+    private Integer id;
+
+    @ApiModelProperty(value = "手机号码")
+    private String phone;
+
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+
+    @ApiModelProperty(value = "职位id")
+    private Integer positionId;
+
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserPositionTempFindDTO.java

+package com.github.wxiaoqi.security.admin.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/9/23 18:36
+ */
+@Data
+public class AppUserPositionTempFindDTO extends PageParam {
+     private String phone;
+     private String name;
+     private Integer status;
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserPositionTemp.java

+package com.github.wxiaoqi.security.admin.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+
+/**
+ * 用户身份职位临时表
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-09 10:00:42
+ */
+@Data
+@Table(name = "app_user_position_temp")
+public class AppUserPositionTemp implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键id")
+    private Integer id;
+	
+
+    @Column(name = "user_id")
+	@ApiModelProperty(value = "用户id")
+    private Integer userId;
+
+
+    @Column(name = "phone")
+	@ApiModelProperty(value = "手机号码")
+    private String phone;
+	
+
+    @Column(name = "position_id")
+	@ApiModelProperty(value = "职位id")
+    private Integer positionId;
+
+	@Column(name = "name")
+	@ApiModelProperty(value = "姓名")
+	private String name;
+
+
+    @Column(name = "crt_time")
+	@ApiModelProperty(value = "创建时间", hidden = true )
+    private Long crtTime;
+	
+
+    @Column(name = "is_del")
+	@ApiModelProperty(value = "是否删除：0-正常；1-删除")
+    private Integer isDel;
+
+
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserPositionTempVo.java

+package com.github.wxiaoqi.security.admin.vo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/9/23 18:38
+ */
+@Builder(toBuilder = true)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AppUserPositionTempVo {
+
+    private Integer id;
+
+    @ApiModelProperty(value = "手机号码")
+    private String phone;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "职位名")
+    private String positionName;
+
+    private Integer positionId;
+
+    @ApiModelProperty(value = "数据状态 1：已核销 2：未核销")
+    private Integer status;
+
+    @ApiModelProperty(value = "创建时间", hidden = true )
+    private Long crtTime;
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionBiz.java

@@ -3,6 +3,7 @@ package com.github.wxiaoqi.security.admin.biz;
 import com.github.wxiaoqi.security.admin.dto.UserPostionDTO;
 import com.github.wxiaoqi.security.admin.vo.WalletPostionVo;
 import org.apache.commons.collections.CollectionUtils;
+import org.jsoup.select.Collector;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -11,9 +12,10 @@ import com.github.wxiaoqi.security.admin.mapper.AppUserPositionMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * 用户身份职位表
@@ -23,7 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  * @date 2019-07-09 10:00:42
  */
 @Transactional
-@Service
+@Service("appUserPositionBiz")
 public class AppUserPositionBiz extends BaseBiz<AppUserPositionMapper,AppUserPosition> {
 
 
@@ -58,4 +60,19 @@ public class AppUserPositionBiz extends BaseBiz<AppUserPositionMapper,AppUserPos
         }
         return counter.get();
     }
+
+    public Map<Integer, AppUserPosition> findPostionIdAndPostionMapByIds(List<Integer> postionIds) {
+        Map<Integer,AppUserPosition> postionMap = new HashMap<>();
+        List<AppUserPosition> data= mapper.selectByIdList(postionIds);
+        if(CollectionUtils.isEmpty(data)){
+            return postionMap;
+        }
+        postionMap = data.stream().collect(Collectors.toMap(AppUserPosition::getId, Function.identity()));
+        return postionMap;
+    }
+
+    public Map<Integer, String> findPostionIdAndNameMap() {
+        List<AppUserPosition> postions = selectListAll();
+        return postions.stream().collect(Collectors.toMap(AppUserPosition::getId,AppUserPosition::getName));
+    }
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserPositionMapper.java

 package com.github.wxiaoqi.security.admin.mapper;
 
-import com.github.wxiaoqi.security.admin.dto.UserPostionDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
 import org.apache.ibatis.annotations.Param;
+import tk.mybatis.mapper.additional.idlist.IdListMapper;
 import tk.mybatis.mapper.common.Mapper;
 
-import java.util.List;
-
 /**
  * 用户身份职位表
  * 
@@ -14,7 +12,7 @@ import java.util.List;
  * @email 18178966185@163.com
  * @date 2019-07-09 10:00:42
  */
-public interface AppUserPositionMapper extends Mapper<AppUserPosition> {
+public interface AppUserPositionMapper extends Mapper<AppUserPosition>, IdListMapper<AppUserPosition,Integer> {
 
 
     AppUserPosition getExtractByUserId(@Param("userId")Integer userId);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserPositionTempMapper.java

+package com.github.wxiaoqi.security.admin.mapper;
+
+
+import com.github.wxiaoqi.security.admin.entity.AppUserPositionTemp;
+import org.apache.ibatis.annotations.Insert;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 用户身份职位表
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-09 10:00:42
+ */
+public interface AppUserPositionTempMapper extends Mapper<AppUserPositionTemp> {
+
+
+    @Insert("INSERT IGNORE INTO `app_user_position_temp`(`user_id`,`phone`,`name`,`position_id`,`crt_time`)VALUES(#{userId},#{phone},#{name},#{positionId},#{crtTime})")
+    void insertWithIgnoreRepeat(AppUserPositionTemp appUserPositionTemp);
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AppUserPositionController.java

 package com.github.wxiaoqi.security.admin.rest.admin;
 
 import com.github.wxiaoqi.security.admin.biz.AppUserPositionBiz;
+import com.github.wxiaoqi.security.admin.biz.AppUserPositionTempBiz;
+import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempDTO;
+import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempFindDTO;
 import com.github.wxiaoqi.security.admin.dto.UserPostionDTO;
+import com.github.wxiaoqi.security.admin.vo.AppUserPositionTempVo;
 import com.github.wxiaoqi.security.admin.vo.WalletPostionVo;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.excel.ExcelImport;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author libin
@@ -22,15 +30,63 @@ public class AppUserPositionController {
     @Autowired
     private AppUserPositionBiz appUserPositionBiz;
 
+    @Autowired
+    private AppUserPositionTempBiz appUserPositionTempBiz;
+
     @GetMapping("/postions")
-     public ObjectRestResponse<List<WalletPostionVo>> findAllPostions(){
+    public ObjectRestResponse<List<WalletPostionVo>> findAllPostions() {
         List<WalletPostionVo> walletPostionVos = appUserPositionBiz.findAllPostions();
         return ObjectRestResponse.succ(walletPostionVos);
     }
 
     @PutMapping
-     public ObjectRestResponse updateUserPostionPercentage(@RequestBody List<UserPostionDTO> userPostionDTOS){
+    public ObjectRestResponse updateUserPostionPercentage(@RequestBody List<UserPostionDTO> userPostionDTOS) {
         appUserPositionBiz.updateUserPostionPercentage(userPostionDTOS);
         return ObjectRestResponse.succ();
     }
+
+
+    /**
+     * 新增或编辑身份信息
+     * @return
+     */
+    @PostMapping("/add")
+    public ObjectRestResponse<Void> addUserPostion(@RequestBody AppUserPositionTempDTO appUserPositionTempDTO){
+         appUserPositionTempBiz.add(appUserPositionTempDTO);
+        return ObjectRestResponse.succ();
+    }
+
+    /**
+     * 批量导入
+     * @param userPostionExcel
+     * @return
+     */
+    @PostMapping("/excel/import")
+    public ObjectRestResponse<Map<String,Object>> importUserPostion(@RequestPart("file") MultipartFile userPostionExcel) {
+        List<String[]> userPostionData = ExcelImport.getExcelData(userPostionExcel);
+        if (userPostionData.size() < 2) {
+            return ObjectRestResponse.createFailedResult(1001, "导入不能没数据！！！");
+        }
+        userPostionData.remove(0);
+        Map<String,Object> result = appUserPositionTempBiz.importUserPostion(userPostionData);
+        return ObjectRestResponse.succ(result);
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @DeleteMapping("/{id}")
+    public ObjectRestResponse<Void> deleteUserPostion(@PathVariable(value = "id") Integer id){
+        appUserPositionTempBiz.updateAppuserPostionStatusById(id,1);
+        return ObjectRestResponse.succ();
+    }
+
+    @PostMapping("/page")
+    public ObjectRestResponse<PageDataVO<AppUserPositionTempVo>> findWithPage(@RequestBody AppUserPositionTempFindDTO appUserPositionTempFindDTO){
+       PageDataVO<AppUserPositionTempVo>  dataVO =  appUserPositionTempBiz.findWithPage(appUserPositionTempFindDTO);
+       return ObjectRestResponse.succ(dataVO);
+    }
+
 }

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/util/IntegralToolsUtils.java

@@ -25,7 +25,6 @@ public class IntegralToolsUtils {
         endDate.setTime(date2);
         return endDate.getDate() - startDate.getDate();
     }
-
     //获取当天的0点
     public static Long getDayStart() {
         long current = System.currentTimeMillis();

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/IntegralSignRecordBiz.java

@@ -80,7 +80,7 @@ public class IntegralSignRecordBiz extends BaseBiz<IntegralSignRecordMapper, Int
                        mapper.updateByPrimaryKeySelective(integralSignRecord);
                        //添加积分记录
                        addPoint(objectRestResponse.getData(),integralSignRecord, appUserDTO, integralSignRecord.getSignDays());
-                   } else if(day >1 ) {//断续签
+                   } else if(day > 1 || day < 0) {//断续签,小于0代表跨年签到
                        //规则连续签到 断签需要重新签到
                        if(objectRestResponse.getData().getIsContinuity()) {
                            integralSignRecord.setIsdel(true);

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

@@ -137,7 +137,7 @@ public class MsgBiz {
         if (msgVoList.size() > 0) {
             return ObjectRestResponse.succ(msgVoList.get(0));
         }
-        return ObjectRestResponse.succ();
+        return ObjectRestResponse.createFailedResult(ResultCode.IM_MSG_NOT_EXIST_CODE, ResultCode.getMsg(ResultCode.IM_MSG_NOT_EXIST_CODE));
     }
 
     public ObjectRestResponse getMsgListByUserId(Integer page, Integer limit, Integer type) {
@@ -273,8 +273,6 @@ public class MsgBiz {
                 BeanUtil.copyProperties(msg, msgVo, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
                 //添加用户昵称和头像
                 ImiVo imiVo = userBiz.getUserInfo(msg.getUserId());
-                log.info("获取用户头像和昵称 : 用户ID>>> {}", msg.getUserId());
-                log.info("获取用户头像和昵称 : imiVo>>> {}", imiVo);
                 if (imiVo != null) {
                     msgVo.setNickname(imiVo.getNickname());
                     msgVo.setPicUrl(imiVo.getHeadimgurl());