Merge branch 'master_activity' into dev

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/entity/ImsMeepoXianchangRid.java

+package com.xxfc.platform.summit.entity;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.*;
+
+@Data
+@Table(name = "ims_meepo_xianchang_rid")
+@ApiModel(value = "活动实体")
+public class ImsMeepoXianchangRid {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @Column(name = "weid")
+    @ApiModelProperty(value = "主公众号")
+    private String weId;
+
+    @Column(name = "uid")
+    @ApiModelProperty(value = "所属用户")
+    private String uid;
+
+    @Column(name = "rid")
+    @ApiModelProperty(value = "规则ID")
+    private String rid;
+
+    @Column(name = "title")
+    @ApiModelProperty(value = "活动标题")
+    private String title;
+
+    @Column(name = "start_time")
+    @ApiModelProperty(value = "活动开始时间")
+    private String startTime;
+
+    @Column(name = "end_time")
+    @ApiModelProperty(value = "活动结束时间")
+    private String endTime;
+
+    @Column(name = "controls")
+    @ApiModelProperty(value = "controls")
+    private String controls;
+
+    @Column(name = "zz_controls")
+    @ApiModelProperty(value = "zz_controls")
+    private String zzControls;
+
+    @Column(name = "gz_must")
+    @ApiModelProperty(value = "gz_must")
+    private String gzMust;
+
+    @Column(name = "gz_url")
+    @ApiModelProperty(value = "gz_url")
+    private String gzUrl;
+
+    @Column(name = "pass_word")
+    @ApiModelProperty(value = "场控密码")
+    private String passWord;
+
+    @Column(name = "status")
+    @ApiModelProperty(value = "status")
+    private String status;
+
+    @Column(name = "is_share")
+    @ApiModelProperty(value = "is_share")
+    private String isShare;
+
+    @Column(name = "open_gps")
+    @ApiModelProperty(value = "open_gps")
+    private String openGps;
+
+    @Column(name = "must_location")
+    @ApiModelProperty(value = "must_location")
+    private String mustLocation;
+
+    @Column(name = "tengxun_ak")
+    @ApiModelProperty(value = "开发秘钥")
+    private String tengxunAk;
+
+    @Column(name = "gps_bg")
+    @ApiModelProperty(value = "地区背景")
+    private String gpsBg;
+
+    @Column(name = "success_time")
+    @ApiModelProperty(value = "success_time")
+    private String successTime;
+
+    @Column(name = "open_gps_tiaoshi")
+    @ApiModelProperty(value = "open_gps_tiaoshi")
+    private String openGpsTiaoshi;
+
+    @Column(name = "is_pay")
+    @ApiModelProperty(value = "is_pay")
+    private String isPay;
+
+    @Column(name = "pay_type")
+    @ApiModelProperty(value = "pay_type")
+    private String payType;
+
+    @Column(name = "total_money")
+    @ApiModelProperty(value = "total_money")
+    private String totalMoney;
+
+    @Column(name = "can_join")
+    @ApiModelProperty(value = "can_join")
+    private String canJoin;
+
+    @Column(name = "pay_user")
+    @ApiModelProperty(value = "pay_user")
+    private String payUser;
+
+    @Column(name = "pay_orderid")
+    @ApiModelProperty(value = "订单号")
+    private String payOrderid;
+
+    @Column(name = "is_important")
+    @ApiModelProperty(value = "is_important")
+    private String isImportant;
+
+    @Column(name = "has_del")
+    @ApiModelProperty(value = "has_del")
+    private String hasDel;
+
+    @Column(name = "can_clearuser")
+    @ApiModelProperty(value = "can_clearuser")
+    private String canClearuser;
+
+    @Column(name = "openappnav")
+    @ApiModelProperty(value = "openappnav")
+    private String openappnav;
+
+    @Column(name = "appnav")
+    @ApiModelProperty(value = "appnav")
+    private String appnav;
+
+    @Column(name = "openpcnav")
+    @ApiModelProperty(value = "openpcnav")
+    private String openpcnav;
+
+    @Column(name = "pcnav")
+    @ApiModelProperty(value = "pcnav")
+    private String pcnav;
+
+    @Column(name = "must_range")
+    @ApiModelProperty(value = "must_range")
+    private String mustRange;
+
+    @Column(name = "pclogin_bgimg")
+    @ApiModelProperty(value = "pclogin_bgimg")
+    private String pcloginBgimg;
+
+    @Column(name = "pclogin_bgvideo")
+    @ApiModelProperty(value = "pclogin_bgvideo")
+    private String pcloginBgvideo;
+
+    @Column(name = "mustbm")
+    @ApiModelProperty(value = "mustbm")
+    private String mustbm;
+
+    @Column(name = "dwtype")
+    @ApiModelProperty(value = "dwtype")
+    private String dwtype;
+
+    @Column(name = "mustaddress")
+    @ApiModelProperty(value = "mustaddress")
+    private String mustaddress;
+
+    @Column(name = "facebm")
+    @ApiModelProperty(value = "1为必须人脸签到，2为无需")
+    private String facebm;
+
+}

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

@@ -137,4 +137,19 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
         params.put("id",id);
         return params;
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    public boolean remove(Integer id) {
+        try {
+            Activity activity = new Activity();
+            activity.setId(id);
+            activity.setIsDel(1);
+            updateSelectiveById(activity);
+            return true;
+        } catch (Exception e) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            e.printStackTrace();
+            return false;
+        }
+    }
 }

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

+package com.xxfc.platform.summit.biz;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.summit.entity.ImsMeepoXianchangRid;
+import com.xxfc.platform.summit.mapper.ImsMeepoXianchangRidMapper;
+import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.List;
+
+@Service
+public class ImsMeepoXianchangRidBiz extends BaseBiz<ImsMeepoXianchangRidMapper, ImsMeepoXianchangRid> {
+
+    public List<ImsMeepoXianchangRid> getIds(Integer page, Integer limit) {
+        Example example =new Example(ImsMeepoXianchangRid.class);
+        example.orderBy("id").desc();
+        PageHelper.startPage(page,limit);
+        List<ImsMeepoXianchangRid> rids = mapper.selectByExample(example);
+        return new PageInfo<ImsMeepoXianchangRid>(rids).getList();
+    }
+}

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

@@ -97,7 +97,7 @@ public class UserBiz extends BaseBiz<UserMapper, User> {
             log.info("----code为空---");
             throw new BaseException(ResultCode.FAILED_CODE, Sets.newSet("code为空"));
         }
-        String openid = "oXDd91N8Rwijd3gscAND9TO77a2I";
+        String openid = "oXDd91MppH9i5F7xzPwigiMj--5w";
         /*String access_token = null;
         try {
             JSONObject jsonData = weixinService.getAccessToken(code);

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

@@ -68,4 +68,13 @@ public class ActivityController extends BaseController<ActivityBiz, Activity> {
         return ObjectRestResponse.createDefaultFail();
     }
 
+
+    @PutMapping("/remove/id")
+    @ApiOperation(value = "删除",notes = "删除")
+    public ObjectRestResponse remove(@PathVariable Integer id ){
+        if (baseBiz.remove(id)) {
+            return ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createDefaultFail();
+    }
 }

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

+package com.xxfc.platform.summit.controller;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.google.common.collect.Lists;
+import com.xxfc.platform.summit.biz.ImsMeepoXianchangRidBiz;
+import com.xxfc.platform.summit.entity.ImsMeepoXianchangRid;
+import org.apache.commons.collections.CollectionUtils;
+import org.mockito.internal.util.collections.ListUtil;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/imxr")
+public class ImsMeepoXianchangRidController extends BaseController<ImsMeepoXianchangRidBiz, ImsMeepoXianchangRid> {
+    @GetMapping("/ids")
+    public ObjectRestResponse<List> getIds(@RequestParam(value = "page",defaultValue = "1")Integer page,
+                                           @RequestParam(value = "limit",defaultValue = "10")Integer limit
+                                           ){
+        List<ImsMeepoXianchangRid> rids = baseBiz.getIds(page, limit);
+        if (CollectionUtils.isEmpty(rids)) {
+            return ObjectRestResponse.succ(Lists.newArrayList());
+        }
+        List<String> collect = rids.parallelStream().map(ImsMeepoXianchangRid::getId).collect(Collectors.toList());
+        return ObjectRestResponse.succ(collect);
+    }
+}

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/mapper/ImsMeepoXianchangRidMapper.java

+package com.xxfc.platform.summit.mapper;
+
+import com.xxfc.platform.summit.entity.ImsMeepoXianchangRid;
+import tk.mybatis.mapper.common.Mapper;
+
+public interface ImsMeepoXianchangRidMapper extends Mapper<ImsMeepoXianchangRid> {
+}