话题接口

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/NewIssueFormDTO.java

@@ -4,7 +4,6 @@ import lombok.Data;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 
@@ -38,7 +37,7 @@ public class NewIssueFormDTO implements Serializable {
 	/**
      * 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年）,默认1
 	 */
-	@NotNull(message = "数据时间类型不能为空")
+	//@NotNull(message = "数据时间类型不能为空")
 	private Integer someMonthsType = 1;
 
 	/**

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/HotTopicFormDTO.java

@@ -44,5 +44,5 @@ public class HotTopicFormDTO implements Serializable {
 	/**
 	 * 部门ID列表
 	 */
-	List<Long> gridIds;
+	List<Long> deptIdList;
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/NewHotTopicFormDTO.java

@@ -4,7 +4,6 @@ import lombok.Data;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 
@@ -38,11 +37,11 @@ public class NewHotTopicFormDTO implements Serializable {
 	/**
      * 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年）,默认1
 	 */
-	@NotNull(message = "数据时间类型不能为空")
+	//@NotNull(message = "数据时间类型不能为空")
 	private Integer someMonthsType = 1;
 
 	/**
 	 * 部门ID列表
 	 */
-	List<Long> gridIds;
+	List<Long> deptIdList;
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicAnalysisServiceImpl.java

@@ -76,7 +76,7 @@ public class TopicAnalysisServiceImpl extends BaseServiceImpl<TopicAnalysisDao,
 	 */
 	@Override
 	public Result getHotTopicList(HotTopicFormDTO hotTopicFormDTO){
-		hotTopicFormDTO.setGridIds(SecurityUser.getUser().getDeptIdList());
+		hotTopicFormDTO.setDeptIdList(SecurityUser.getUser().getDeptIdList());
 		List<HotTopicResultDTO> list = baseDao.selectHotTopicList(hotTopicFormDTO);
 		return new Result().ok(list);
 	}
@@ -89,9 +89,7 @@ public class TopicAnalysisServiceImpl extends BaseServiceImpl<TopicAnalysisDao,
 	 */
 	@Override
 	public Result getNewTopicList(NewHotTopicFormDTO newHotTopicFormDTO){
-		/*Long long1 = 1169158285790900226L;
-		Long long2 = 1169158285790900226L;*/
-		newHotTopicFormDTO.setGridIds(SecurityUser.getUser().getDeptIdList());
+		newHotTopicFormDTO.setDeptIdList(SecurityUser.getUser().getDeptIdList());
 		List<NewHotTopicResultDTO> list = baseDao.selectNewHotTopicList(newHotTopicFormDTO);
 		return new Result().ok(list);
 	}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/topic/TopicAnalysisDao.xml

@@ -126,8 +126,8 @@
     <!--最新发布话题APP接口-->
     <resultMap id="newHotTopicListMap" type="com.elink.esua.epdc.dto.topic.result.NewHotTopicResultDTO">
         <result property="id" column="ID"/>
-        <result property="content" column="TOPIC_CONTENT"/>
-        <result property="deptName" column="ALL_DEPT_NAMES"/>
+        <result property="content" column="content"/>
+        <result property="deptName" column="deptName"/>
         <result property="createdTime" column="CREATED_TIME"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
@@ -158,12 +158,12 @@
         WHERE
         t.DEL_FLAG = '0'
         AND t.STATE = 0
-        AND et.GRID_ID IN
+        AND t.GRID_ID IN
         <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
             #{deptId}
         </foreach>
         <if test="timestamp != null and timestamp != ''">
-            AND DATE_FORMAT( et.CREATED_TIME, '%Y-%m-%d %H:%i:%s' ) &lt;= #{timestamp}
+            AND DATE_FORMAT( t.CREATED_TIME, '%Y-%m-%d %H:%i:%s' ) &lt;= #{timestamp}
         </if>
         ORDER BY
         t.CREATED_TIME DESC

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java

@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -70,14 +69,7 @@ public class ApiAnalysisIssueController {
     public Result<List<NewIssueResultDTO>> getNewIssueList(@RequestBody NewIssueFormDTO formDto) {
         //效验数据
         ValidatorUtils.validateEntity(formDto);
-        Long long1 = 1169158285790900226L;
-        Long long2 = 1169158285790900226L;
-        List<Long> ll = new ArrayList<Long>();
-        ll.add(long1);
-        ll.add(long2);
-        formDto.setDeptIdList(ll);
-        //List<Long> aa = SecurityUser.getUser().getDeptIdList();
-        //formDto.setGridIds(SecurityUser.getUser().getDeptIdList());
+        formDto.setDeptIdList(SecurityUser.getUser().getDeptIdList());
         return analysisIssueService.getNewIssueList(formDto);
     }
 }