新闻消息

common/src/main/java/com/jpsoft/employment/modules/base/dao/NewsRegUserDAO.java

@@ -15,4 +15,5 @@ public interface NewsRegUserDAO {
 	int delete(String id);
 	List<NewsRegUser> list();
 	List<NewsRegUser> search(Map<String, Object> searchParams, List<Sort> sortList);
+	NewsRegUser getByNewsAndUser(String newsId, String userId);
 }

common/src/main/java/com/jpsoft/employment/modules/base/entity/NewsInfo.java

@@ -35,7 +35,6 @@ public class NewsInfo {
 	
 				@ApiModelProperty(value = "创建人")
 	private String createBy;
-	private String createName;
 	
 					@ApiModelProperty(value = "创建时间")
 	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")

common/src/main/java/com/jpsoft/employment/modules/base/service/NewsRegUserService.java

@@ -14,4 +14,5 @@ public interface NewsRegUserService {
 	int delete(String id);
 	List<NewsRegUser> list();
 	Page<NewsRegUser> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+	NewsRegUser getByNewsAndUser(String newsId, String userId);
 }

common/src/main/java/com/jpsoft/employment/modules/base/service/impl/NewsRegUserServiceImpl.java

@@ -67,4 +67,10 @@ public class NewsRegUserServiceImpl implements NewsRegUserService {
         
         return page;
 	}
+
+	@Override
+	public NewsRegUser getByNewsAndUser(String newsId, String userId) {
+		// TODO Auto-generated method stub
+		return newsRegUserDAO.getByNewsAndUser(newsId, userId);
+	}
 }

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

@@ -15,7 +15,8 @@
 			<result property="updateTime" column="update_time" />
 			<result property="delFlag" column="del_flag" />
 
-		<result property="createName" column="create_name" />
+		<result property="createByN" column="create_name" />
+		<result property="typeN" column="type_name" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.NewsInfo">
 	<!--
@@ -88,8 +89,9 @@
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="NewsInfoMap">
 		<![CDATA[
-			SELECT a.*,b.real_name AS create_name FROM base_news_info a
+			SELECT a.*,b.real_name AS create_name,c.name_ AS type_name FROM base_news_info a
 			LEFT JOIN sys_user b ON a.create_by = b.id_
+			LEFT JOIN sys_data_dictionary c ON (a.type_ = c.value_ AND parent_id = '2d8658a6-7159-4414-993e-ce09f5ba5a24')
 		]]>
 		<where>
 			a.del_flag = 0

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

@@ -87,4 +87,10 @@
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
+	<select id="getByNewsAndUser" parameterType="string" resultMap="NewsRegUserMap">
+		select * from base_news_reg_user
+		where del_flag = 0
+		and news_id = #{newsId}
+		and reg_user_id = #{userId}
+	</select>
 </mapper>

web/src/main/java/com/jpsoft/employment/modules/base/api/NewsApi.java

@@ -29,6 +29,8 @@ public class NewsApi {
 
     @Autowired
     private NewsInfoService newsInfoService;
+    @Autowired
+    private NewsRegUserService newsRegUserService;
 
     @ApiOperation(value="列表")
     @RequestMapping(value = "list",method = RequestMethod.POST)
@@ -95,11 +97,24 @@ public class NewsApi {
 
     @ApiOperation(value="详情")
     @RequestMapping(value = "detail",method = RequestMethod.POST)
-    public MessageResult detail(String id) {
+    public MessageResult detail(String id, HttpServletRequest request) {
         MessageResult msgResult = new MessageResult<>();
+        String subject = (String)request.getAttribute("subject");
 
         NewsInfo newsInfo = newsInfoService.get(id);
 
+        NewsRegUser newsRegUser = newsRegUserService.getByNewsAndUser(newsInfo.getId(), subject);
+        if(newsRegUser == null) {
+            newsRegUser = new NewsRegUser();
+            newsRegUser.setId(UUID.randomUUID().toString());
+            newsRegUser.setRegUserId(subject);
+            newsRegUser.setNewsId(newsInfo.getId());
+            newsRegUser.setDelFlag(false);
+            newsRegUser.setCreateBy(subject);
+            newsRegUser.setCreateTime(new Date());
+            newsRegUserService.insert(newsRegUser);
+        }
+
         msgResult.setResult(true);
         msgResult.setData(newsInfo);
 

web/src/main/resources/application-dev.yml

@@ -5,12 +5,12 @@ server:
 
 spring:
   datasource:
-     url: jdbc:log4jdbc:mysql://192.168.33.20:3306/love_donation?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-     username: root
-     password: jpsoft2016
-#    url: jdbc:log4jdbc:mysql://116.62.150.160:3306/love_donation?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-#    username: root
-#    password: jpsoft
+#     url: jdbc:log4jdbc:mysql://192.168.33.20:3306/love_donation?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#     username: root
+#     password: jpsoft2016
+    url: jdbc:log4jdbc:mysql://116.62.150.160:3306/love_donation?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    username: root
+    password: jpsoft
   devtools:
     add-properties: false
     restart: