企联活动

common/src/main/java/com/jpsoft/enterprise/modules/base/dto/ActivityInfoDTO.java

@@ -0,0 +1,23 @@
+package com.jpsoft.enterprise.modules.base.dto;
+
+import lombok.Data;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2021-1-13 9:54
+ */
+@Data
+public class ActivityInfoDTO {
+
+    private String id;
+
+    private String title;
+
+    private String startTime;
+
+    private String endTime;
+
+    private String picUrl;
+
+    private String content;
+}

common/src/main/java/com/jpsoft/enterprise/modules/base/dto/ActivityInfoListDTO.java

@@ -0,0 +1,21 @@
+package com.jpsoft.enterprise.modules.base.dto;
+
+import lombok.Data;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2021-1-12 17:03
+ */
+@Data
+public class ActivityInfoListDTO {
+
+
+    private String id;
+
+    private String title;
+
+    private String picUrl;
+
+    private String createTime;
+
+}

common/src/main/java/com/jpsoft/enterprise/modules/base/entity/ActivityInfo.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 import java.text.SimpleDateFormat;
 import java.math.BigDecimal;
+
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,102 +12,79 @@ import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
 /**
-  描述:base_activity_info的实体类
+ * 描述:base_activity_info的实体类
  */
 @Data
 @ApiModel(value = "base_activity_info的实体类")
 public class ActivityInfo {
-	/**
-	 *
-	 */
-        @ApiModelProperty(value = "")
-	private String id;
-	/**
-	 *标题内容
-	 */
-        @ApiModelProperty(value = "标题内容")
-	private String title;
-	/**
-	 *标题图片
-	 */
-        @ApiModelProperty(value = "标题图片")
-	private String titleUrl;
-	/**
-	 *内容图片
-	 */
-        @ApiModelProperty(value = "内容图片")
-	private String contentUrl;
-	/**
-	 *跳转类型:0-跳转,1-领取
-	 */
-        @ApiModelProperty(value = "跳转类型:0-跳转,1-领取")
-	private String linkType;
-	/**
-	 *跳转链接地址
-	 */
-        @ApiModelProperty(value = "跳转链接地址")
-	private String linkUrl;
-	/**
-	 *按钮名称
-	 */
-        @ApiModelProperty(value = "按钮名称")
-	private String buttonName;
-	/**
-	 *分类
-	 */
-        @ApiModelProperty(value = "分类")
-	private String classify;
-	/**
-	 *0-未审核，1-已审核
-	 */
-        @ApiModelProperty(value = "0-未审核，1-已审核")
-	private Boolean enabled;
-	/**
-	 *序号
-	 */
-        @ApiModelProperty(value = "序号")
-	private Integer sortNo;
-	/**
-	 *开始时间
-	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "开始时间")
-	private Date startTime;
-	/**
-	 *结束时间
-	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "结束时间")
-	private Date endTime;
-	/**
-	 *创建人
-	 */
-        @ApiModelProperty(value = "创建人")
-	private String createBy;
-	/**
-	 *创建时间
-	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "创建时间")
-	private Date createTime;
-	/**
-	 *更新人
-	 */
-        @ApiModelProperty(value = "更新人")
-	private String updateBy;
-	/**
-	 *更新时间
-	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-	/**
-	 *是否删除
-	 */
-        @ApiModelProperty(value = "是否删除")
-	private Boolean delFlag;
+    /**
+     *
+     */
+    @ApiModelProperty(value = "")
+    private String id;
+    /**
+     * 标题内容
+     */
+    @ApiModelProperty(value = "标题内容")
+    private String title;
+    /**
+     * 标题图片
+     */
+    @ApiModelProperty(value = "标题图片")
+    private String picUrl;
+
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+    @ApiModelProperty(value = "是否上架")
+    private Boolean status;
+
+    /**
+     * 序号
+     */
+    @ApiModelProperty(value = "序号")
+    private Integer sortNo;
+    /**
+     * 开始时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "开始时间")
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "结束时间")
+    private Date endTime;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**
+     * 更新时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
 }

common/src/main/resources/mapper/base/ActivityInfo.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!-- namespace必须指向DAO接口 -->
 <mapper namespace="com.jpsoft.enterprise.modules.base.dao.ActivityInfoDAO">
@@ -16,6 +16,7 @@
 			<result property="updateBy" column="update_by" />
 			<result property="updateTime" column="update_time" />
 			<result property="delFlag" column="del_flag" />
+			<result property="sortNo" column="sort_no"/>
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.enterprise.modules.base.entity.ActivityInfo">
 	<!--
@@ -25,7 +26,7 @@
 	-->
 	<![CDATA[
 		insert into base_activity_info
-	    (id_,title_,start_time,end_time,pic_url,content_,status_,create_by,create_time,update_by,update_time,del_flag)
+	    (id_,title_,start_time,end_time,pic_url,content_,status_,create_by,create_time,update_by,update_time,del_flag,sort_no)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -40,6 +41,7 @@
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{delFlag,jdbcType= NUMERIC }
+,#{sortNo,jdbcType=INTEGER}
 		)
 	]]>
 	</insert>
@@ -82,12 +84,14 @@
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
 		</if>
+			<if test="sortNo!=null">
+				sort_no=#{sortNo,jdbcType=INTEGER },
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="ActivityInfoMap">
-		select 
-id_,title_,start_time,end_time,pic_url,content_,status_,create_by,create_time,update_by,update_time,del_flag		from base_activity_info where id_=#{0}
+		select * from base_activity_info where id_=#{0} and del_flag = 0
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_activity_info where id_=#{0}
@@ -100,6 +104,7 @@ id_,title_,start_time,end_time,pic_url,content_,status_,create_by,create_time,up
 			select * from base_activity_info
 		]]>
 		<where>
+			del_flag = 0
 			<if test="searchParams.id != null">
 				and ID_ like #{searchParams.id}
 			</if>

web/src/main/java/com/jpsoft/enterprise/config/WebMvcConfig.java

@@ -70,6 +70,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
 				.excludePathPatterns("/mobile/companyInfoApi/attributeList")
 				.excludePathPatterns("/mobile/companyInfoApi/industryList")
 				.excludePathPatterns("/mobile/enterpriseInfoApi/enterpriseInfo")
+				.excludePathPatterns("/mobile/activityInfoApi/activityList")
+                .excludePathPatterns("/mobile/activityInfoApi/activityDetail")
 				.excludePathPatterns("/wechat/**")
 
         ;

web/src/main/java/com/jpsoft/enterprise/modules/mobile/controller/ActivityInfoApiController.java

@@ -0,0 +1,127 @@
+package com.jpsoft.enterprise.modules.mobile.controller;
+
+import cn.hutool.core.date.DateUtil;
+import com.github.pagehelper.Page;
+import com.jpsoft.enterprise.modules.base.dto.ActivityInfoDTO;
+import com.jpsoft.enterprise.modules.base.dto.ActivityInfoListDTO;
+import com.jpsoft.enterprise.modules.base.dto.NewsInfoListDTO;
+import com.jpsoft.enterprise.modules.base.entity.ActivityInfo;
+import com.jpsoft.enterprise.modules.base.entity.NewsInfo;
+import com.jpsoft.enterprise.modules.base.entity.NewsType;
+import com.jpsoft.enterprise.modules.base.service.ActivityInfoService;
+import com.jpsoft.enterprise.modules.common.dto.MessageResult;
+import com.jpsoft.enterprise.modules.common.dto.Sort;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2021-1-12 17:02
+ */
+@RestController
+@RequestMapping("/mobile/activityInfoApi")
+@Slf4j
+public class ActivityInfoApiController {
+
+    @Autowired
+    private ActivityInfoService activityInfoService;
+
+
+
+    @PostMapping("activityList")
+    @ApiOperation(value = "活动列表(公开接口)")
+    public MessageResult<Map> activityList(@RequestParam(value="pageIndex",defaultValue="1") int pageIndex, @RequestParam(value="pageSize",defaultValue="10") int pageSize) {
+        MessageResult<Map> messageResult = new MessageResult<>();
+
+        try {
+            List<ActivityInfo> activityInfoList = new ArrayList<>();
+            List<ActivityInfoListDTO> list = new ArrayList<>();
+
+
+
+            Map<String,Object> searchParams = new HashMap<>();
+            searchParams.put("status",1);
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("create_time","desc"));
+
+            Page<ActivityInfo> page = activityInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+            List<ActivityInfo> activityInfos = page.getResult();
+            if (activityInfos.size()>0){
+                for (ActivityInfo activityInfo : activityInfos){
+                    ActivityInfoListDTO activityInfoListDTO = new ActivityInfoListDTO();
+                    BeanUtils.copyProperties(activityInfo,activityInfoListDTO);
+                    activityInfoListDTO.setCreateTime(DateUtil.format(activityInfo.getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
+                    list.add(activityInfoListDTO);
+                }
+
+
+            }
+
+            Map<String,Object> pageMap = new HashMap<>();
+
+            pageMap.put("recordsTotal",page.getTotal());
+            pageMap.put("recordsFiltered",page.getTotal());
+            pageMap.put("totalPage",page.getPages());
+            pageMap.put("pageNumber",page.getPageNum());
+            pageMap.put("pageSize",page.getPageSize());
+            pageMap.put("data", list);
+
+            messageResult.setData(pageMap);
+            messageResult.setResult(true);
+            messageResult.setCode(200);
+        } catch (Exception ex) {
+            log.error(ex.getMessage(),ex);
+            messageResult.setCode(400);
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+
+
+    @PostMapping("activityDetail")
+    @ApiOperation(value = "活动详情(公开接口)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "id", required = true, paramType = "form")
+    })
+    public MessageResult<ActivityInfoDTO> activityDetail(String id) {
+        MessageResult<ActivityInfoDTO> messageResult = new MessageResult<>();
+
+        try {
+
+            ActivityInfo activityInfo = activityInfoService.get(id);
+            if (activityInfo !=null){
+                ActivityInfoDTO activityInfoDTO = new ActivityInfoDTO();
+                BeanUtils.copyProperties(activityInfo,activityInfoDTO);
+                activityInfoDTO.setStartTime(DateUtil.format(activityInfo.getStartTime(),"yyyy-MM-dd"));
+                activityInfoDTO.setEndTime(DateUtil.format(activityInfo.getEndTime(),"yyyy-MM-dd"));
+                messageResult.setData(activityInfoDTO);
+            }
+
+            messageResult.setResult(true);
+            messageResult.setCode(200);
+        } catch (Exception ex) {
+            log.error(ex.getMessage(),ex);
+            messageResult.setCode(400);
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+}

web/src/main/java/com/jpsoft/enterprise/modules/mobile/controller/PersonInfoApiController.java

@@ -346,24 +346,30 @@ public class PersonInfoApiController {
         try {
 
             Map<String, Object> dataMap = new HashMap<String, Object>();
-            PersonInfo personInfo = personInfoService.findByOpenId(openId);
-            if (personInfo != null) {
-                String token = JwtUtil.createToken(jwtSecret, personInfo.getId() + "", DateUtil.offsetHour(new Date(), 6));
-                String registerTypeName = dataDictionaryService.findNameByCatalogNameAndValue("注册用户类型", personInfo.getRegisterType());
-                personInfo.setRegisterTypeName(registerTypeName);
-                dataMap.put("personInfo", personInfo);
-                dataMap.put("token", token);
-                CompanyInfoDetailDTO companyInfoDetailDTO = new CompanyInfoDetailDTO();
-                CompanyInfo companyInfo = companyInfoService.get(personInfo.getCompanyId());
-                companyInfoDetailDTO.setCompanyName(companyInfo.getCompanyName());
-                companyInfoDetailDTO.setId(companyInfo.getId());
-                companyInfoDetailDTO.setLogoUrl(companyInfo.getLogoUrl());
 
-                dataMap.put("companyInfo", companyInfoDetailDTO);
+            if (StringUtils.isNotBlank(openId)) {
 
-                int messageNum = messageReceiverService.countByReadStatus(personInfo.getId(), false);
 
-                dataMap.put("messageNum", messageNum);
+                PersonInfo personInfo = personInfoService.findByOpenId(openId);
+                if (personInfo != null) {
+                    String token = JwtUtil.createToken(jwtSecret, personInfo.getId() + "", DateUtil.offsetHour(new Date(), 6));
+                    String registerTypeName = dataDictionaryService.findNameByCatalogNameAndValue("注册用户类型", personInfo.getRegisterType());
+                    personInfo.setRegisterTypeName(registerTypeName);
+                    dataMap.put("personInfo", personInfo);
+                    dataMap.put("token", token);
+                    CompanyInfoDetailDTO companyInfoDetailDTO = new CompanyInfoDetailDTO();
+                    CompanyInfo companyInfo = companyInfoService.get(personInfo.getCompanyId());
+                    companyInfoDetailDTO.setCompanyName(companyInfo.getCompanyName());
+                    companyInfoDetailDTO.setId(companyInfo.getId());
+                    companyInfoDetailDTO.setLogoUrl(companyInfo.getLogoUrl());
+
+                    dataMap.put("companyInfo", companyInfoDetailDTO);
+
+                    int messageNum = messageReceiverService.countByReadStatus(personInfo.getId(), false);
+
+                    dataMap.put("messageNum", messageNum);
+                }
+
             }
 
             messageResult.setData(dataMap);