修改新闻相关

enterprise-manager-ui/admin/src/views/news/drawershow.vue

@@ -8,16 +8,18 @@
             size="50%">
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
-                             <Field label="类型" :span="20" prop="categoryId" v-model="form.categoryId" type="select" :enum-data="dict.categoryId" placeholder="请输入分类id"/>
+                             <Field label="类型" :span="20" prop="categoryId" v-model="form.categoryId" type="radio" :enum-data="dict.categoryId" placeholder="请输入分类id"/>
               <Field :span="20" label="封面"><imageUpload v-model="form.titleLogoPath" prePath="/file/preview"/></Field>
               <Field label="标题" :span="20" prop="title" v-model="form.title"  placeholder="请输入标题"/>
               <Field :span="20" label="内容"><editor v-model="form.content" :min-height="256"/></Field>
 
               <Field :span="20" label="责任编辑" prop="editor" v-model="form.editor" placeholder="请输入责任编辑"/>
 
-              <Field :span="20" label="发布部门" prop="deptId" v-model="form.deptId" placeholder="请输入发布部门"/>
+              <Field :span="20" label="发布部门" prop="deptId" v-model="form.deptId" type="select" :enum-data="dict.deptId" placeholder="请输入发布部门"/>
 
-              <Field :span="20" label="文章来源" prop="source" v-model="form.source" type="textarea" placeholder="请输入文章来源"/>
+              <Field :span="20" label="文章来源" prop="source" v-model="form.source" placeholder="请输入文章来源"/>
+
+              <Field label="发布时间" prop="publishTime" v-model="form.publishTime" type="date" />
 
               <Field :span="20" label="声明" prop="statement" v-model="form.statement" type="textarea" placeholder="请输入声明"/>
 
@@ -52,32 +54,26 @@
                 toString:[
                     "top",
                     "viewNums",
+                    "categoryId"
                 ],
                 toDate:[
                     "publishTime",
                 ],
                 // 表单校验
                 rules: {
+                  categoryId: [
+                    {required: true,message: "请选择频道类型", trigger: "blur" },
+                  ],
                     title: [
                         {required: true,message: "请输入标题", trigger: "blur" },
                         {max: 512,message: "最多只能录入512个字符",trigger: "blur",},
                     ],
                     titleLogoPath: [
                         {required: true,message: "请输入标题logo", trigger: "blur" },
-                        {max: 512,message: "最多只能录入512个字符",trigger: "blur",},
-                    ],
-                    top: [
-                        {required: true,message: "请输入置顶 ", trigger: "blur" },
-                    ],
-                    viewNums: [
-                        {required: true,message: "请输入浏览次数", trigger: "blur" },
                     ],
                     publishTime: [
                         {required: true,message: "请选择发布时间" },
-                    ],
-                    createTime: [
-                        {required: true,message: "请选择创建时间" },
-                    ],
+                    ]
                 }
             };
         },

enterprise-manager-ui/admin/src/views/news/list.vue

@@ -34,7 +34,7 @@
                 this.$refs.drawerform.view(row);
             },
 
-          handTop(row,top) {
+          handleTop(row,top) {
 
               this.$post("/news/save",{id:row.id,top:top}).then((res) => {
                 if (res.code == 1) {
@@ -48,6 +48,31 @@
 
           },
 
+          handleViews(row) {
+            //查询详细
+            this.$post("/news/record/list",{newsId:row.id}).then((res) => {
+              if (res.code == 1) {
+                console.log("views-data",res)
+                this.getData();
+              }
+            }).catch((error) => {
+                  this.$message.error(error.message);
+                });
+
+          },
+
+
+          handleShares(row) {
+            //分享详细
+            this.$post("/news/share/list",{newsId:row.id}).then((res) => {
+              if (res.code == 1) {
+                console.log("shares-data",res)
+                this.getData();
+              }
+            }).catch((error) => {
+                  this.$message.error(error.message);
+                });
+          },
         },
         data() {
             return {
@@ -67,7 +92,15 @@
                         {label: "数据",formatter:  row => {
                           let bool=false;
                             return (
-                                <div><el-link underline={bool} type="primary">浏览({row.viewNums})</el-link></div>
+                                <div>
+                                  <el-link underline={bool} onClick={() => {
+                                    this.handleViews(row);
+                                  }}  type="primary">浏览({row.viewNums})</el-link><br/>
+
+                                  <el-link underline={bool} onClick={() => {
+                                    this.handleShares(row);
+                                  }}  type="primary">分享({row.shareNums})</el-link>
+                                </div>
                             );}},
 
 
@@ -85,7 +118,7 @@
                                               type="text"
                                               icon="el-icon-open"
                                               onClick={() => {
-                                                this.handTop(row,1);
+                                                this.handleTop(row,1);
                                               }}
                                           >
                                             置顶
@@ -96,7 +129,7 @@
                                               type="text"
                                               icon="el-icon-open"
                                               onClick={() => {
-                                                this.handTop(row,0);
+                                                this.handleTop(row,0);
                                               }}
                                           >
                                             取消置顶

enterprise-manager/src/main/java/com/mortals/xhx/module/news/web/NewsController.java

@@ -3,6 +3,8 @@ package com.mortals.xhx.module.news.web;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.base.system.user.model.UserQuery;
+import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.module.dept.model.DeptEntity;
 import com.mortals.xhx.module.dept.model.DeptQuery;
 import com.mortals.xhx.module.dept.service.DeptService;
@@ -56,6 +58,8 @@ public class NewsController extends BaseCRUDJsonBodyMappingController<NewsServic
     private NewsCategoryService newsCategoryService;
     @Autowired
     private DeptService deptService;
+    @Autowired
+    private UserService userService;
 
 
     public NewsController() {
@@ -68,6 +72,9 @@ public class NewsController extends BaseCRUDJsonBodyMappingController<NewsServic
         this.addDict(model, "viewNums", paramService.getParamBySecondOrganize("News", "viewNums"));
         this.addDict(model, "categoryId", newsCategoryService.find(new NewsCategoryQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getName(), (o, n) -> n)));
         this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName(), (o, n) -> n)));
+
+        this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
+
         super.init(model, context);
     }