完成社区：文章管理功能

platform-admin/src/main/java/com/platform/controller/TbCfStationItemController.java

@@ -64,7 +64,9 @@ public class TbCfStationItemController extends ApiBaseAction {
     @RequiresPermissions("tbcfstationitem:list")
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
-        if (!Constant.SUPER_ADMIN.equals(ShiroUtils.getUserId())) {
+        if (!Constant.SUPER_ADMIN.equals(ShiroUtils.getUserId()) &&
+                !Constant.SUPER_ITEM.equals(ShiroUtils.getUserId()) &&
+                !Constant.SUPER_USER.equals(ShiroUtils.getUserId())) {
             params.put("creator", ShiroUtils.getUserId());
         }
         String userId = ShiroUtils.getUserId();

platform-admin/src/main/java/com/platform/controller/TbCfUserInfoController.java

@@ -105,7 +105,7 @@ public class TbCfUserInfoController {
     @ResponseBody
     @GetMapping("/queryByAccount")
     public R queryByAccount(@RequestParam("account") String account) {
-
-        return R.ok();
+        String userId = tbCfUserInfoService.queryById(account);
+        return R.ok().put("userId", userId);
     }
 }

platform-admin/src/main/java/com/platform/entity/TbCfArticleEntity.java

@@ -58,6 +58,16 @@ public class TbCfArticleEntity implements Serializable {
      */
     private Date updatetime;
 
+    private String account;
+
+    public String getAccount() {
+        return account;
+    }
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
     /**
      * 设置：文章ID
      */

platform-admin/src/main/java/com/platform/service/TbCfUserInfoService.java

@@ -73,5 +73,5 @@ public interface TbCfUserInfoService {
 
     long queryUserTotal();
 
-    boolean queryByAccount(String account);
+    String queryByAccount(String account);
 }

platform-admin/src/main/java/com/platform/service/impl/TbCfUserInfoServiceImpl.java

@@ -68,8 +68,8 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService {
     }
 
     @Override
-    public boolean queryByAccount(String account) {
+    public String queryByAccount(String account) {
 
-        return tbCfUserInfoDao.queryById(account) == null ? true : false;
+        return tbCfUserInfoDao.queryById(account) ;
     }
 }

platform-admin/src/main/resources/com/platform/dao/TbCfArticleDao.xml

@@ -17,7 +17,7 @@
         <result property="updatetime" column="updateTime"/>
     </resultMap>
 
-	<select id="queryObject" resultType="com.platform.entity.TbCfArticleEntity">
+    <select id="queryObject" resultType="com.platform.entity.TbCfArticleEntity">
 		select
 			`id`,
 			`title`,
@@ -34,46 +34,48 @@
 		where id = #{id}
 	</select>
 
-	<select id="queryList" resultType="com.platform.entity.TbCfArticleEntity">
-		select
-    		`id`,
-    		`title`,
-    		`content`,
-    		`picture`,
-    		`author_type`,
-    		`author`,
-    		`like_num`,
-    		`del_flag`,
-    		`top`,
-    		`createTime`,
-    		`updateTime`
-		from tb_cf_article
-		WHERE 1=1
-		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
-		</if>
+    <select id="queryList" resultType="com.platform.entity.TbCfArticleEntity">
+        select
+        `id`,
+        `title`,
+        `content`,
+        `picture`,
+        `author_type`,
+        `author`,
+        `like_num`,
+        `del_flag`,
+        `top`,
+        `createTime`,
+        `updateTime`,
+        u.account account
+        from tb_cf_article a left join tb_cf_user_info u
+        on a.author=u.user_id
+        WHERE 1=1
+        <if test="name != null and name.trim() != ''">
+            AND title LIKE concat('%',#{name},'%')
+        </if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
                 order by ${sidx} ${order}
             </when>
-			<otherwise>
-                order by id desc
-			</otherwise>
+            <otherwise>
+                order by createTime desc
+            </otherwise>
         </choose>
-		<if test="offset != null and limit != null">
-			limit #{offset}, #{limit}
-		</if>
-	</select>
-	
- 	<select id="queryTotal" resultType="int">
-		select count(*) from tb_cf_article
-		WHERE 1=1
-        <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
+        <if test="offset != null and limit != null">
+            limit #{offset}, #{limit}
         </if>
-	</select>
-	 
-	<insert id="save" parameterType="com.platform.entity.TbCfArticleEntity">
+    </select>
+
+    <select id="queryTotal" resultType="int">
+        select count(*) from tb_cf_article
+        WHERE 1=1
+		<if test="name != null and name.trim() != ''">
+			AND title LIKE concat('%',#{name},'%')
+		</if>
+    </select>
+
+    <insert id="save" parameterType="com.platform.entity.TbCfArticleEntity">
 		insert into tb_cf_article(
 			`id`,
 			`title`,
@@ -99,33 +101,33 @@
 			#{createtime},
 			#{updatetime})
 	</insert>
-	 
-	<update id="update" parameterType="com.platform.entity.TbCfArticleEntity">
-		update tb_cf_article 
-		<set>
-			<if test="title != null">`title` = #{title}, </if>
-			<if test="content != null">`content` = #{content}, </if>
-			<if test="picture != null">`picture` = #{picture}, </if>
-			<if test="authorType != null">`author_type` = #{authorType}, </if>
-			<if test="author != null">`author` = #{author}, </if>
-			<if test="likeNum != null">`like_num` = #{likeNum}, </if>
-			<if test="delFlag != null">`del_flag` = #{delFlag}, </if>
-			<if test="top != null">`top` = #{top}, </if>
-			<if test="createtime != null">`createTime` = #{createtime}, </if>
-			<if test="updatetime != null">`updateTime` = #{updatetime}</if>
-		</set>
-		where id = #{id}
-	</update>
-	
-	<delete id="delete">
+
+    <update id="update" parameterType="com.platform.entity.TbCfArticleEntity">
+        update tb_cf_article
+        <set>
+            <if test="title != null">`title` = #{title},</if>
+            <if test="content != null">`content` = #{content},</if>
+            <if test="picture != null">`picture` = #{picture},</if>
+            <if test="authorType != null">`author_type` = #{authorType},</if>
+            <if test="author != null">`author` = #{author},</if>
+            <if test="likeNum != null">`like_num` = #{likeNum},</if>
+            <if test="delFlag != null">`del_flag` = #{delFlag},</if>
+            <if test="top != null">`top` = #{top},</if>
+            <if test="createtime != null">`createTime` = #{createtime},</if>
+            <if test="updatetime != null">`updateTime` = #{updatetime}</if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <delete id="delete">
 		delete from tb_cf_article where id = #{value}
 	</delete>
-	
-	<delete id="deleteBatch">
-		delete from tb_cf_article where id in 
-		<foreach item="id" collection="array" open="(" separator="," close=")">
-			#{id}
-		</foreach>
-	</delete>
+
+    <delete id="deleteBatch">
+        delete from tb_cf_article where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 
 </mapper>
\ No newline at end of file

platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfarticle.html

@@ -6,11 +6,11 @@
 </head>
 <body>
 <div id="rrapp" v-cloak style="height: calc(100% - 15px);">
-	<div v-show="showList" style="height: 100%;">
+    <div v-show="showList" style="height: 100%;">
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
+                    <i-input v-model="q.name" @on-enter="query" placeholder="文章标题"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
@@ -27,18 +27,35 @@
                 #end
             </div>
         </Row>
-	    <table id="jqGrid"></table>
+        <table id="jqGrid"></table>
     </div>
 
     <Card v-show="!showList">
         <p slot="title">{{title}}</p>
-		<i-form ref="formValidate" :model="tbCfArticle" :rules="ruleValidate" :label-width="80">
-            <Form-item label="文章标题" prop="title">
+        <i-form ref="formValidate" :model="tbCfArticle" :rules="ruleValidate" :label-width="80">
+            <Form-item label="文章标题" prop="title" style="width: 800px">
                 <i-input v-model="tbCfArticle.title" placeholder="文章标题"/>
             </Form-item>
             <!--<Form-item label="图片" prop="picture">
                 <i-input v-model="tbCfArticle.picture" placeholder="图片"/>
             </Form-item>-->
+            <!--            <Form-item label="用户类型" prop="authorType" style="width: 800px">-->
+            <!--                <i-select v-model="tbCfArticle.authorType" style="width:200px" @on-change="changeType" :disabled="disabled">-->
+            <!--                    <i-option v-for="item in typeList" :value="item.value">{{ item.label }}</i-option>-->
+            <!--                </i-select>-->
+            <!--            </Form-item>-->
+            <Form-item label="用户类型" prop="authorType" style="width: 800px">
+                <i-select placeholder="请选择" v-model="tbCfArticle.authorType" :disabled="disabled"
+                          @on-change="changeType">
+                    <i-option v-for="(el,i) in typeList" :key='i'
+                              :value="el.value">{{el.label}}
+                    </i-option>
+                </i-select>
+            </Form-item>
+            <Form-item label="app账户" prop="author" style="width: 800px" v-show="!account">
+                <i-input v-model="tbCfArticle.author" placeholder="260977204970 or ctehillah@gmail.com"
+                         @on-blur="queryAccount"/>
+            </Form-item>
             <Form-item label="图片" prop="picture">
                 <!--   <i-input v-model="xPicture.pictureUrl" placeholder="图片地址"/> -->
                 <upload
@@ -67,11 +84,12 @@
 
             <Form-item>
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
-                <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>
+                <i-button type="warning" @click="reload" style="margin-left: 8px"/>
+                返回</i-button>
                 <i-button type="ghost" @click="handleReset('formValidate')" style="margin-left: 8px">重置</i-button>
             </Form-item>
         </i-form>
-	</Card>
+    </Card>
 </div>
 <script src="${rc.contextPath}/statics/libs/iview.js"></script>
 <script src="${rc.contextPath}/js/sys/tbcfarticle.js?_${date.systemTime}"></script>

platform-admin/src/main/webapp/js/common.js

@@ -465,13 +465,22 @@ imageFormat = function (cellvalue, options, rowObject) {
         if (cellvalue.indexOf(';')) {
             let split = cellvalue.split(';');
             cellvalue = '<img src="' + split[0] + '"  style="width:30px;height:30px;" />';
+        } else if (cellvalue.indexOf(',')) {
+            let split = cellvalue.split(',');
+            cellvalue = '<img src="' + split[0] + '"  style="width:30px;height:30px;" />';
         } else {
             cellvalue = '<img src="' + cellvalue + '"  style="width:30px;height:30px;" />';
         }
     }
     return cellvalue;
 };
+accountFormat = function (cellvalue, options, rowObject) {
 
+    if (cellvalue == '' || cellvalue == null) {
+        cellvalue = '系统用户';
+    }
+    return cellvalue;
+}
 /**
  * 跳转翻译
  * @param cellvalue

platform-common/src/main/java/com/platform/utils/Constant.java

@@ -10,6 +10,15 @@ public class Constant {
      */
     public static final String SUPER_ADMIN = "1";
 
+    /**
+     * 管理员
+     */
+    public static final String SUPER_ITEM="2";
+    /**
+     * 管理员
+     */
+    public static final String SUPER_USER="3";
+
     /**
      * 默认系统domainId 业务系统
      */