Merge branch 'master_activity' of...

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

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/ActivityShowBiz.java

@@ -5,12 +5,14 @@ import com.xxfc.platform.summit.dto.ActivityShowDto;
 import com.xxfc.platform.summit.entity.Activity;
 import com.xxfc.platform.summit.entity.ActivityShow;
 import com.xxfc.platform.summit.mapper.ActivityShowMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtilsBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.GetMapping;
+import sun.rmi.runtime.Log;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -18,6 +20,7 @@ import java.lang.reflect.InvocationTargetException;
  * @author Administrator
  */
 @Service
+@Slf4j
 public class ActivityShowBiz extends BaseBiz<ActivityShowMapper, ActivityShow> {
 
     @Autowired
@@ -46,6 +49,7 @@ public class ActivityShowBiz extends BaseBiz<ActivityShowMapper, ActivityShow> {
             }
         } catch (Exception e) {
             e.printStackTrace();
+            log.error(e.toString());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             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/controller/ActivityController.java

@@ -69,7 +69,7 @@ public class ActivityController extends BaseController<ActivityBiz, Activity> {
     }
 
 
-    @PutMapping("/remove/id")
+    @DeleteMapping("/remove/{id}")
     @ApiOperation(value = "删除",notes = "删除")
     public ObjectRestResponse remove(@PathVariable Integer id ){
         if (baseBiz.remove(id)) {

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> {
+}

xx-summit/xx-summit-server/src/main/resources/mapper/ActivityMapper.xml

@@ -12,7 +12,7 @@
             and title like CONCAT('%',#{title},'%')
         </if>
         <if test="startTime != null">
-            and from_unixtime(start_time,'%Y-%m-%e %H')=from_unixtime(unix_timestamp(), '%Y-%m-%e %H')
+            and from_unixtime(start_time/1000,'%Y-%m-%e %H')=from_unixtime(unix_timestamp(), '%Y-%m-%e %H')
         </if>
         <if test="status != null and status == 1">
             and (status=#{status} or (status=0 and  (start_time/1000) &gt;= unix_timestamp())  )

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/impl/UploadZipServiceImpl.java

@@ -8,6 +8,7 @@ import com.xxfc.platform.universal.constant.enumerate.FileTypeEnum;
 import com.xxfc.platform.universal.service.UploadZipService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
 import org.codehaus.plexus.util.IOUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -96,7 +97,11 @@ public class UploadZipServiceImpl implements UploadZipService {
                 }
             }
         }
-        result.substring(0,result.length()-1);
-        return ObjectRestResponse.succ(result.substring(0, result.length()-1));
+
+        if (StringUtils.isNotEmpty(result.toString())) {
+            result.substring(0,result.length()-1);
+            return ObjectRestResponse.succ(result.substring(0, result.length()-1));
+        }
+       return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"压缩包中无照片或照片格式不对!");
     }
 }