Merge remote-tracking branch 'origin/dev' into dev

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;
+
+    @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/biz/AppUserPositionTempBiz.java

+package com.github.wxiaoqi.security.admin.biz;
+
+import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempDTO;
+import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempFindDTO;
+import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
+import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
+import com.github.wxiaoqi.security.admin.entity.AppUserPositionTemp;
+import com.github.wxiaoqi.security.admin.mapper.AppUserPositionTempMapper;
+import com.github.wxiaoqi.security.admin.vo.AppUserPositionTempVo;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.google.common.collect.Lists;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.DependsOn;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
+
+import java.time.Instant;
+import java.util.*;
+import java.util.stream.Collectors;
+
+
+/**
+ * 用户身份职位表
+ *
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-09 10:00:42
+ */
+@Transactional
+@DependsOn("appUserPositionBiz")
+@Service
+public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, AppUserPositionTemp> implements InitializingBean {
+
+    @Autowired
+    private AppUserDetailBiz detailBiz;
+
+    @Autowired
+    private AppUserLoginBiz loginBiz;
+
+    @Autowired
+    private AppUserPositionBiz appUserPositionBiz;
+
+    private Map<Integer, String> postionIdAndNameMap;
+
+
+    public ObjectRestResponse add(AppUserPositionTempDTO appUserPositionTempDTO) {
+        if (appUserPositionTempDTO == null || StringUtils.isBlank(appUserPositionTempDTO.getPhone()) || StringUtils.isBlank(appUserPositionTempDTO.getName())
+                || appUserPositionTempDTO.getPositionId() == null || appUserPositionTempDTO.getPositionId() == 0) {
+            return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "参数不能为空");
+        }
+        String phone = appUserPositionTempDTO.getPhone();
+        Integer id = appUserPositionTempDTO.getId() == null ? 0 : appUserPositionTempDTO.getId();
+        Example example = new Example(AppUserPositionTemp.class);
+        example.createCriteria().andEqualTo("phone", phone).andNotEqualTo("id", id).andEqualTo("isDel", 0);
+        List<AppUserPositionTemp> list = selectByExample(example);
+        if (list.size() > 0) {
+            return ObjectRestResponse.createFailedResult(ResultCode.EXIST_CODE, "手机号码已存在");
+        }
+        Integer userId = 0;
+        AppUserLogin userLogin = loginBiz.checkeUserLogin(phone);
+        if (userLogin != null) {
+            userId = userLogin.getId();
+        }
+        AppUserPositionTemp userPositionTemp = new AppUserPositionTemp();
+        BeanUtils.copyProperties(appUserPositionTempDTO, userPositionTemp);
+        userPositionTemp.setUserId(userId);
+        //编辑
+        if (id == null || id == 0) {
+            insertSelective(userPositionTemp);
+        } else {
+            updateSelectiveById(userPositionTemp);
+        }
+        if (userId!=0){
+            detailBiz.updateUserPositionByUserId(userId,appUserPositionTempDTO.getPositionId());
+        }
+        return ObjectRestResponse.succ();
+    }
+
+    public void updateAppuserPostionStatusById(Integer id, int status) {
+        AppUserPositionTemp appUserPositionTemp = new AppUserPositionTemp();
+        appUserPositionTemp.setId(id);
+        appUserPositionTemp.setIsDel(status);
+        mapper.updateByPrimaryKeySelective(appUserPositionTemp);
+    }
+
+    public PageDataVO<AppUserPositionTempVo> findWithPage(AppUserPositionTempFindDTO appUserPositionTempFindDTO) {
+        PageDataVO<AppUserPositionTempVo> dataVO = new PageDataVO<>();
+        Example example = new Example(AppUserPositionTemp.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("isDel", 0);
+        if (StringUtils.isNotEmpty(appUserPositionTempFindDTO.getName())) {
+            criteria.andLike("name", String.format("%%%s%%", appUserPositionTempFindDTO.getName().trim()));
+        }
+        if (StringUtils.isNotEmpty(appUserPositionTempFindDTO.getPhone())) {
+            criteria.andEqualTo("phone", appUserPositionTempFindDTO.getPhone());
+        }
+        if (DataStatus.USERED.code == appUserPositionTempFindDTO.getStatus()) {
+            criteria.andIsNotNull("userId");
+        }
+        if (DataStatus.NO_USERED.code == appUserPositionTempFindDTO.getStatus()) {
+            criteria.andIsNull("userId");
+        }
+        PageDataVO<AppUserPositionTemp> pageDataVO = PageDataVO.pageInfo(appUserPositionTempFindDTO.getPage(), appUserPositionTempFindDTO.getLimit(), () -> mapper.selectByExample(example));
+        List<AppUserPositionTemp> data = pageDataVO.getData();
+        if (CollectionUtils.isEmpty(data)) {
+            dataVO.setData(Collections.EMPTY_LIST);
+            dataVO.setPageNum(appUserPositionTempFindDTO.getPage());
+            dataVO.setPageSize(appUserPositionTempFindDTO.getLimit());
+            return dataVO;
+        }
+
+        List<Integer> postionIds = data.stream().map(AppUserPositionTemp::getPositionId).collect(Collectors.toList());
+        Map<Integer, AppUserPosition> postionMap = appUserPositionBiz.findPostionIdAndPostionMapByIds(postionIds);
+
+        List<AppUserPositionTempVo> appUserPositionTempVos = new ArrayList<>();
+        AppUserPositionTempVo appUserPositionTempVo;
+        for (AppUserPositionTemp appUserPositionTemp : data) {
+            appUserPositionTempVo = new AppUserPositionTempVo();
+            BeanUtils.copyProperties(appUserPositionTemp, appUserPositionTempVo);
+            String postionName = postionMap == null ? "" : postionMap.get(appUserPositionTemp.getPositionId()).getName();
+            appUserPositionTempVo.setPositionName(postionName);
+            appUserPositionTempVo.setStatus(appUserPositionTemp.getUserId() == null ? DataStatus.NO_USERED.code : DataStatus.USERED.code);
+        }
+
+        dataVO.setData(appUserPositionTempVos);
+        dataVO.setPageSize(pageDataVO.getPageSize());
+        dataVO.setPageNum(pageDataVO.getPageNum());
+        dataVO.setTotalCount(pageDataVO.getTotalCount());
+        dataVO.setTotalPage(pageDataVO.getTotalPage());
+        return dataVO;
+    }
+
+    public Map<String,Object> importUserPostion(List<String[]> userPostionData) {
+        Map<String,Object> result = new HashMap<>(2);
+        List<Map<String, Object>> errorResult = Lists.newArrayList();
+        Map<String, Object> errorResultMap;
+
+        Set<Map.Entry<Integer, String>> entrySet = postionIdAndNameMap.entrySet();
+        AppUserPositionTemp appUserPositionTemp;
+        for (int i = 0; i < userPostionData.size(); i++) {
+            String[] data = userPostionData.get(i);
+            Integer postionId = null;
+            String name="";
+            String phone="";
+            String postionName="";
+            try {
+                 name = data[0];
+                 phone = data[1];
+                if (StringUtils.isEmpty(phone)){
+                    throw new BaseException("手机号为空");
+                }
+                 postionName = data[2];
+                if (StringUtils.isEmpty(postionName)){
+                    throw new BaseException("身份为空");
+                }
+                //根据手机号查询userId
+                AppUserLogin userLogin = loginBiz.checkeUserLogin(phone);
+                for (Map.Entry<Integer, String> integerStringEntry : entrySet) {
+                    if (integerStringEntry.getValue().contains(postionName)) {
+                        postionId = integerStringEntry.getKey();
+                        break;
+                    }
+                }
+                appUserPositionTemp = new AppUserPositionTemp();
+                appUserPositionTemp.setCrtTime(Instant.now().toEpochMilli());
+                appUserPositionTemp.setName(name);
+                appUserPositionTemp.setPositionId(postionId);
+                appUserPositionTemp.setPhone(phone);
+                appUserPositionTemp.setUserId(0);
+                if (Objects.nonNull(userLogin)) {
+                    //更新用户身份信息
+                    detailBiz.updateUserPositionByUserId(userLogin.getId(), postionId);
+                    appUserPositionTemp.setUserId(userLogin.getId());
+                }
+                mapper.insertWithIgnoreRepeat(appUserPositionTemp);
+            } catch (BaseException ex) {
+                errorResultMap = new HashMap<>(1);
+                errorResultMap.put("num", i);
+                errorResultMap.put("msg",ex.getMessage());
+                errorResult.add(errorResultMap);
+            }catch (ArrayIndexOutOfBoundsException ex){
+                errorResultMap = new HashMap<>(1);
+                errorResultMap.put("num", i);
+                String msg= "";
+                if(StringUtils.isEmpty(phone)){
+                    msg+="手机号码缺失";
+                }
+                if (StringUtils.isEmpty(postionName)){
+                    msg+=",身份信息缺失";
+                }
+                errorResultMap.put("msg",msg);
+                errorResult.add(errorResultMap);
+            } catch (Exception ex){
+                errorResultMap = new HashMap<>(1);
+                errorResultMap.put("num", i);
+                errorResultMap.put("msg","数据"+Arrays.toString(data)+"保存失败");
+                errorResult.add(errorResultMap);
+            }
+        }
+         result.put("success",userPostionData.size()-errorResult.size());
+         result.put("error",errorResult.size());
+         result.put("data",errorResult);
+        return result;
+    }
+
+    private enum DataStatus {
+        USERED(1), NO_USERED(0);
+        private int code;
+
+        DataStatus(int code) {
+            this.code = code;
+        }
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        postionIdAndNameMap = appUserPositionBiz.findPostionIdAndNameMap() == null ? Collections.EMPTY_MAP : appUserPositionBiz.findPostionIdAndNameMap();
+    }
+
+}

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
@@ -19,18 +27,66 @@ import java.util.List;
 @RequestMapping("/postion/admin")
 public class AppUserPositionController {
 
-     @Autowired
+    @Autowired
     private AppUserPositionBiz appUserPositionBiz;
 
-     @GetMapping("/postions")
-     public ObjectRestResponse<List<WalletPostionVo>> findAllPostions(){
-          List<WalletPostionVo> walletPostionVos  = appUserPositionBiz.findAllPostions();
-         return ObjectRestResponse.succ(walletPostionVos);
-     }
-
-     @PutMapping
-     public ObjectRestResponse updateUserPostionPercentage(@RequestBody List<UserPostionDTO> userPostionDTOS){
-         appUserPositionBiz.updateUserPostionPercentage(userPostionDTOS);
-         return ObjectRestResponse.succ();
-     }
+    @Autowired
+    private AppUserPositionTempBiz appUserPositionTempBiz;
+
+    @GetMapping("/postions")
+    public ObjectRestResponse<List<WalletPostionVo>> findAllPostions() {
+        List<WalletPostionVo> walletPostionVos = appUserPositionBiz.findAllPostions();
+        return ObjectRestResponse.succ(walletPostionVos);
+    }
+
+    @PutMapping
+    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-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/entity/ActivityBm.java

@@ -61,9 +61,6 @@ public class ActivityBm {
     @ApiModelProperty("创建时间")
     private Long updTime;
 
-    @Column(name = "qd_status")
-    @ApiModelProperty("0-未签到；1-已签到")
-    private Integer qdStatus;
 
     @Column(name = "is_del")
     @ApiModelProperty("是否删除：0-正常；1-删除")

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/pojo/AccessType.java

@@ -5,16 +5,19 @@ import lombok.Data;
 
 public enum AccessType {
     BACKSTAGE(1, "后台管理页面"),
-    PUBLIC(2,"公众号")
-    ;
+    PUBLIC(2,"公众号");
 
-    AccessType(int code, String mas) {
+
+    AccessType(Integer code, String mas) {
+        this.code = code;
+        this.mas = mas;
     }
 
     private Integer code;
 
     private String mas;
 
+
     public Integer getCode() {
         return code;
     }

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/pojo/ActivityQuery.java

@@ -13,5 +13,7 @@ public class ActivityQuery extends Query {
     /**
      * 1.管理后台,2.h5页面
      */
-    private Integer type;
+    private Integer type=1;
+
+
 }

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/util/HttpRequestUtil.java

@@ -34,7 +34,7 @@ public class HttpRequestUtil {
                     str = EntityUtils.toString(result.getEntity(),"UTF-8");
                 } catch (Exception e) {
                     log.error("post请求提交失败:" + url, e);
-                }
+                 }
             }
         } catch (IOException e) {
             log.error("post请求提交失败:" + url, e);

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBiz.java

@@ -24,34 +24,42 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
     /**
      * 未删除
      */
-     private Integer NOT_DELETE=0;
+    private Integer NOT_DELETE = 0;
     private Activity activity;
     /**
      * 已发布
      */
-    private Integer PUBLISHED=1;
+    private Integer PUBLISHED = 1;
 
-    public PageInfo<Activity> getList(ActivityQuery query) {
+    public Object getList(ActivityQuery query) {
 
-        Example exa= new Example(Activity.class);
+        Example exa = new Example(Activity.class);
         Example.Criteria criteria = exa.createCriteria();
-        criteria.andEqualTo("isDel",NOT_DELETE );
+        criteria.andEqualTo("isDel", NOT_DELETE);
         if (StringUtils.isNotBlank(query.getTitle())) {
-            criteria.andLike("title",String.format("%%%s%%",query.getTitle().trim()));
+            criteria.andLike("title", String.format("%%%s%%", query.getTitle().trim()));
         }
-        if (query.getStartTime()!=null) {
-            criteria.andLike("startTime",query.getStartTime()/1000+"%");
+        if (query.getStartTime() != null) {
+            criteria.andLike("startTime", query.getStartTime() / 1000 + "%");
         }
-        if (query.getStatus()!=null) {
-            criteria.andEqualTo("status",query.getStatus());
+        if (query.getStatus() != null) {
+            criteria.andEqualTo("status", query.getStatus());
         }
-        if (query.getType()!=null&& AccessType.PUBLIC.getCode().equals(query.getType())) {
-            criteria.andEqualTo("isPublish",PUBLISHED);
+
+
+        if (query.getType() != null && AccessType.PUBLIC.getCode().equals(query.getType())) {
+            criteria.andEqualTo("isPublish", PUBLISHED);
         }
         exa.orderBy("rank").asc().orderBy("startTime").desc();
-        PageHelper.startPage(query.getPage(),query.getLimit());
+
+        if (AccessType.PUBLIC.getCode().equals(query.getType())) {
+            return mapper.selectByExample(exa);
+        }
+
+
+        PageHelper.startPage(query.getPage(), query.getLimit());
         List<Activity> activities = mapper.selectByExample(exa);
-        return   new PageInfo<Activity>(activities);
+        return new PageInfo<Activity>(activities);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -59,7 +67,7 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
         try {
             activity.setUpdTime(System.currentTimeMillis());
             mapper.updateByPrimaryKeySelective(activity);
-           return true;
+            return true;
         } catch (Exception e) {
             e.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -73,13 +81,13 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
         try {
             activity.setCrtTime(System.currentTimeMillis());
             activity.setIsDel(0);
-            if (activity.getIsOpenBm()==null) {
+            if (activity.getIsOpenBm() == null) {
                 activity.setIsOpenBm(0);
             }
-            if (activity.getIsPublish()==null) {
+            if (activity.getIsPublish() == null) {
                 activity.setIsPublish(0);
             }
-            if (activity.getIsShow()==null) {
+            if (activity.getIsShow() == null) {
                 activity.setIsShow(0);
             }
             mapper.insertSelective(activity);
@@ -94,6 +102,6 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
     @Override
     public void updateSelectiveById(Activity activity) {
         activity.setUpdTime(System.currentTimeMillis());
-          mapper.updateByPrimaryKeySelective(activity);
+        mapper.updateByPrimaryKeySelective(activity);
     }
 }

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBmBiz.java

@@ -247,4 +247,8 @@ public class ActivityBmBiz extends BaseBiz<ActivityBmMapper, ActivityBm> {
         List<ActivityBm> activityBms = mapper.selectByExample(exa);
         return PageInfo.of(activityBms);
     }
+
+    public ActivityBm userBm(ActivityBm activityBm, Integer id) {
+        return null;
+    }
 }

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/ActivityBmController.java

@@ -17,7 +17,7 @@ import javax.servlet.http.HttpServletRequest;
  * @author Administrator
  */
 @RestController
-@RequestMapping("front/activityBm")
+@RequestMapping("/activityBm")
 public class ActivityBmController extends BaseController<ActivityBmBiz,ActivityBm> {
 
 
@@ -29,7 +29,7 @@ public class ActivityBmController extends BaseController<ActivityBmBiz,ActivityB
     public ObjectRestResponse bm(@RequestBody ActivityBm activityBm, HttpServletRequest request){
         User user=userBiz.getSession(request);
         try {
-            return baseBiz.userBm(activityBm,user.getId());
+            return ObjectRestResponse.succ(baseBiz.userBm(activityBm,user.getId()));
         }catch (Exception e){
             e.printStackTrace();
             return  ObjectRestResponse.createDefaultFail();

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/ActivityController.java

@@ -17,7 +17,6 @@ public class ActivityController extends BaseController<ActivityBiz, Activity> {
 
     @PostMapping("/app/unauth/list")
     public ObjectRestResponse getList(@RequestBody ActivityQuery query ){
-
         return ObjectRestResponse.succ(baseBiz.getList(query));
     }