Browse Source

新闻修改

anderx 3 years ago
parent
commit
e68e973346

+ 1 - 1
.idea/artifacts/jitao_server_war.xml

@@ -1,6 +1,6 @@
 <component name="ArtifactManager">
   <artifact type="war" build-on-make="true" name="jitao-server:war">
-    <output-path>$PROJECT_DIR$/out</output-path>
+    <output-path>$PROJECT_DIR$/target</output-path>
     <properties id="maven-jee-properties">
       <options>
         <module>jitao-server</module>

+ 4 - 0
.idea/artifacts/jitao_server_war_exploded.xml

@@ -70,6 +70,10 @@
           <element id="library" level="project" name="Maven: cglib:cglib:2.2.2" />
           <element id="library" level="project" name="Maven: asm:asm:3.3.1" />
           <element id="library" level="project" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" />
+          <element id="library" level="project" name="Maven: javax.xml.bind:jaxb-api:2.3.0" />
+          <element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" />
+          <element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" />
+          <element id="library" level="project" name="Maven: javax.activation:activation:1.1.1" />
           <element id="library" level="project" name="Maven: javax.validation:validation-api:1.1.0.Final" />
           <element id="library" level="project" name="Maven: org.jboss.logging:jboss-logging:3.2.1.Final" />
           <element id="library" level="project" name="Maven: com.fasterxml:classmate:1.1.0" />

+ 12 - 0
.idea/dataSources.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="aft@localhost" uuid="b79c7483-ae84-4235-8d5c-363d095ca943">
+      <driver-ref>mysql.8</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://localhost:3306/aft</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+  </component>
+</project>

+ 32 - 0
.idea/free-mybatis-generator-config.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PersistentConfig">
+    <option name="historyConfigList">
+      <map>
+        <entry key="jt_news">
+          <value>
+            <Config>
+              <option name="comment" value="true" />
+              <option name="daoMvnPath" value="src/main/java" />
+              <option name="daoName" value="JtNewsMapper" />
+              <option name="daoPackage" value="com.goafanti.common.dao" />
+              <option name="daoPostfix" value="Mapper" />
+              <option name="modelMvnPath" value="src/main/java" />
+              <option name="modelName" value="JtNews" />
+              <option name="modelPackage" value="com.goafanti.common.model" />
+              <option name="name" value="jt_news" />
+              <option name="overrideJava" value="true" />
+              <option name="overrideXML" value="true" />
+              <option name="primaryKey" value="" />
+              <option name="projectFolder" value="$PROJECT_DIR$" />
+              <option name="tableName" value="jt_news" />
+              <option name="useSchemaPrefix" value="true" />
+              <option name="xmlMvnPath" value="src/main/java" />
+              <option name="xmlPackage" value="com.goafanti.common.mapper" />
+            </Config>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>

+ 5 - 0
.idea/misc.xml

@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="EntryPointsManager">
+    <list size="1">
+      <item index="0" class="java.lang.String" itemvalue="org.springframework.stereotype.Service" />
+    </list>
+  </component>
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
     <type id="Spring" />

+ 3 - 1
jitao-server.iml

@@ -19,7 +19,9 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />

+ 11 - 0
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -11,6 +11,7 @@ import java.util.Map;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import com.goafanti.news.service.EventPlanningService;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -112,6 +113,9 @@ public class WebpageController extends BaseController {
 	@Resource
 	private AdminVideoService adminVideoService;
 
+	@Resource
+	private EventPlanningService eventPlanningService;
+
 	@RequestMapping(value = "/user/account/index", method = RequestMethod.GET)
 	public ModelAndView index(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/user/account/index");
@@ -1634,4 +1638,11 @@ public class WebpageController extends BaseController {
 		return modelAndView;
 	}
 
+	@RequestMapping("/portal/eventPlanning")
+	public ModelAndView eventPlanning(ModelAndView modelAndView){
+		modelAndView.setViewName("/portal/eventPlanning");
+		eventPlanningService.getList();
+		return modelAndView;
+	}
+
 }

+ 17 - 0
src/main/java/com/goafanti/common/dao/JtNewsMapper.java

@@ -0,0 +1,17 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.JtNews;
+
+public interface JtNewsMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(JtNews record);
+
+    int insertSelective(JtNews record);
+
+    JtNews selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(JtNews record);
+
+    int updateByPrimaryKey(JtNews record);
+}

+ 173 - 0
src/main/java/com/goafanti/common/mapper/JtNewsMapper.xml

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.JtNewsMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.JtNews">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="title" jdbcType="VARCHAR" property="title" />
+    <result column="publisher" jdbcType="VARCHAR" property="publisher" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="picture_url" jdbcType="VARCHAR" property="pictureUrl" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
+    <result column="content" jdbcType="VARCHAR" property="content" />
+    <result column="release_status" jdbcType="INTEGER" property="releaseStatus" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="release_time" jdbcType="TIMESTAMP" property="releaseTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, title, publisher, `type`, picture_url, `status`, sort, content, release_status,
+    create_time, release_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from jt_news
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from jt_news
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.JtNews">
+    insert into jt_news (id, title, publisher,
+      `type`, picture_url, `status`,
+      sort, content, release_status,
+      create_time, release_time)
+    values (#{id,jdbcType=INTEGER}, #{title,jdbcType=VARCHAR}, #{publisher,jdbcType=VARCHAR},
+      #{type,jdbcType=INTEGER}, #{pictureUrl,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
+      #{sort,jdbcType=INTEGER}, #{content,jdbcType=VARCHAR}, #{releaseStatus,jdbcType=INTEGER},
+      #{createTime,jdbcType=TIMESTAMP}, #{releaseTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.JtNews">
+    insert into jt_news
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="title != null">
+        title,
+      </if>
+      <if test="publisher != null">
+        publisher,
+      </if>
+      <if test="type != null">
+        `type`,
+      </if>
+      <if test="pictureUrl != null">
+        picture_url,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="sort != null">
+        sort,
+      </if>
+      <if test="content != null">
+        content,
+      </if>
+      <if test="releaseStatus != null">
+        release_status,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="releaseTime != null">
+        release_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="title != null">
+        #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="publisher != null">
+        #{publisher,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
+      <if test="pictureUrl != null">
+        #{pictureUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="sort != null">
+        #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="content != null">
+        #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="releaseStatus != null">
+        #{releaseStatus,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="releaseTime != null">
+        #{releaseTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.JtNews">
+    update jt_news
+    <set>
+      <if test="title != null">
+        title = #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="publisher != null">
+        publisher = #{publisher,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        `type` = #{type,jdbcType=INTEGER},
+      </if>
+      <if test="pictureUrl != null">
+        picture_url = #{pictureUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="sort != null">
+        sort = #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="content != null">
+        content = #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="releaseStatus != null">
+        release_status = #{releaseStatus,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="releaseTime != null">
+        release_time = #{releaseTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.JtNews">
+    update jt_news
+    set title = #{title,jdbcType=VARCHAR},
+      publisher = #{publisher,jdbcType=VARCHAR},
+      `type` = #{type,jdbcType=INTEGER},
+      picture_url = #{pictureUrl,jdbcType=VARCHAR},
+      `status` = #{status,jdbcType=INTEGER},
+      sort = #{sort,jdbcType=INTEGER},
+      content = #{content,jdbcType=VARCHAR},
+      release_status = #{releaseStatus,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      release_time = #{releaseTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="JtNewsList" resultType="com.goafanti.common.model.JtNews">
+    select id,title,publisher,`type`,picture_url pictureUrl,status,sort,content,release_status releaseStatus,
+           date_format(create_time,'%Y-%m-%d' ) as createTimes,date_format(release_time,'%Y-%m-%d' ) as releaseTimes
+    from jt_news
+  </select>
+  <select id="JtNewsCount">
+
+  </select>
+</mapper>

+ 152 - 0
src/main/java/com/goafanti/common/model/JtNews.java

@@ -0,0 +1,152 @@
+package com.goafanti.common.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * jt_news
+ * @author 
+ */
+public class JtNews implements Serializable {
+    private Integer id;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 发布人
+     */
+    private String publisher;
+
+    /**
+     * 类型 0公司新闻 1行业新闻
+     */
+    private Integer type;
+
+    /**
+     * 图片url
+     */
+    private String pictureUrl;
+
+    /**
+     * 状态 0正常 1首页
+     */
+    private Integer status;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 发布状态 0否 1是
+     */
+    private Integer releaseStatus;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 发布时间
+     */
+    private Date releaseTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getPublisher() {
+        return publisher;
+    }
+
+    public void setPublisher(String publisher) {
+        this.publisher = publisher;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getPictureUrl() {
+        return pictureUrl;
+    }
+
+    public void setPictureUrl(String pictureUrl) {
+        this.pictureUrl = pictureUrl;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public Integer getReleaseStatus() {
+        return releaseStatus;
+    }
+
+    public void setReleaseStatus(Integer releaseStatus) {
+        this.releaseStatus = releaseStatus;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getReleaseTime() {
+        return releaseTime;
+    }
+
+    public void setReleaseTime(Date releaseTime) {
+        this.releaseTime = releaseTime;
+    }
+}

+ 19 - 0
src/main/java/com/goafanti/news/controller/AdminEventPlanningApiController.java

@@ -0,0 +1,19 @@
+package com.goafanti.news.controller;
+
+import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.news.service.EventPlanningService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 新闻
+ */
+@RestController
+@RequestMapping(value = "/api/admin/eventPlanning")
+public class AdminEventPlanningApiController extends BaseApiController {
+	@Autowired
+	private EventPlanningService eventPlanningService;
+
+}

+ 10 - 0
src/main/java/com/goafanti/news/service/EventPlanningService.java

@@ -0,0 +1,10 @@
+package com.goafanti.news.service;
+
+import com.goafanti.common.model.JtNews;
+import com.goafanti.core.mybatis.page.Pagination;
+
+import java.util.List;
+
+public interface EventPlanningService {
+    Pagination<JtNews> getList();
+}

+ 24 - 0
src/main/java/com/goafanti/news/service/impl/EventPlanningServiceImpl.java

@@ -0,0 +1,24 @@
+package com.goafanti.news.service.impl;
+
+import com.goafanti.common.dao.JtNewsMapper;
+import com.goafanti.common.model.JtNews;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.news.service.EventPlanningService;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public  class EventPlanningServiceImpl extends BaseMybatisDao<JtNewsMapper> implements EventPlanningService {
+
+
+    @Override
+    public Pagination<JtNews> getList() {
+        Map<String ,Object>param = new HashMap<>();
+        Pagination<JtNews> p= (Pagination<JtNews>) findPage("JtNewsList","JtNewsCount",param,1,10);
+        return p;
+    }
+}

+ 4 - 4
src/main/resources/props/config_local.properties

@@ -38,15 +38,15 @@ app.name=AFT
 app.mobile.website=http://m.jishutao.com/1.0/template/index.html
 template.cacheable=false
 
-#static.host=//ss.jishutao.com/client/1.2.8
-#portal.host=//ss.jishutao.com/portal/1.2.11
+static.host=//ss.jishutao.com/client/1.2.8
+portal.host=//ss.jishutao.com/portal/1.2.11
 skjt.host=//ss.jishutao.com/skjt/1.3
 
 
 #本地
 #static.host=//172.16.0.255/client/1.2.8
-static.host=//172.16.0.255:3000/jitao/client/1.2.9
-portal.host=//172.16.0.255:3000/jitao/portal/1.2.11
+#static.host=//172.16.0.255:3000/jitao/client/1.2.9
+#portal.host=//172.16.0.255:3000/jitao/portal/1.2.11
 
 #avatar.host=//ss.jishutao.com
 #avatar.upload.host=//ss.jishutao.com/upload

+ 12 - 3
src/main/webapp/WEB-INF/views/common.html

@@ -51,16 +51,21 @@
 					</li>
 				</ul>
 			</div>
+			<div class="technology"><a href="javascript:;">技术创业</a><a href="javascript:;">技术评估</a></div>
 			<div class="APP">
 				<img th:src="${portalHost+'/img/indedImg/inded30.png'}" alt="" />
-				<a>APP下载
-					<span class="webkitDown"></span>
+				<a>APP下载<span class="webkitDown"></span>
 				</a>
+
 				<div class="xialaewm">
 					<div class="cont_rights android" id="Android">
 						<img th:src="${portalHost+'/img/erweima_android.jpg'}" alt="">
 						<p>Android版</p>
 					</div>
+					<div class="cont_rights ios" id="ios">
+						<img th:src="${portalHost+'/img/erweima_iphone.png'}" alt="">
+						<p>ios版</p>
+					</div>
 				</div>
 			</div>
 		</div>
@@ -242,7 +247,7 @@
 					</li>
 					<li th:class="${subM}=='eventPlanning'?active:''" >
 						<div>
-							<a th:href="@{/portal/thinkTank/policyList?type=0}" >活动策划</a>
+							<a th:href="@{/portal/eventPlanning}" >活动策划</a>
 						</div>
 					</li>
                      <!-- <li th:class="${subM}=='special'?active:''" >
@@ -315,6 +320,10 @@
 							<img th:src="${portalHost+'/img/erweima_android.jpg'}" alt=""/>
 							<p>Android版</p>
 						</div>
+						<div class="cont_right ios">
+						<img th:src="${portalHost+'/img/erweima_iphone.png'}" alt=""/>
+						<p>ios版</p >
+						</div>
 						<div class="cont_right">
 							<img th:src="${portalHost+'/img/erweima.jpg'}" alt=""/>
 							<p>微信公众号</p>

+ 39 - 0
src/main/webapp/WEB-INF/views/portal/eventPlanning.html

@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head th:replace="common::header(~{::title},~{::link})">
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>技淘网-活动策划</title>
+    <link th:href="${portalHost + '/dll/dll.css'}" rel="stylesheet">
+    <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
+</head>
+
+<body>
+    <div class="app">
+        <div th:replace="common::nav('','eventPlanning')"></div>
+        <!-- 主体内容 -->
+        <div class="news main">
+            <div class="container">
+                <!-- 新闻列表 -->
+                <ul class="newslist">
+
+                </ul>
+                <!-- 新闻列表  end -->
+                <!-- 分页 -->
+                <div class="page_1"></div>
+                <!-- 分页 end -->
+            </div>
+        </div>
+        <!-- 主体内容  end -->
+        <!-- 底部 -->
+        <footer>
+            <div th:replace="common::copyright"></div>
+            <div th:replace="common::login"></div>
+        </footer>
+        <div th:replace="common::footer(~{::script})">
+            <script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
+            <script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+        </div>
+</body>
+</html>

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/services.html

@@ -85,7 +85,7 @@
                         <span>发布我的服务需求</span>
                     </li>
                     <li>
-                    	<a onclick="openZoosUrl('chatwin');">
+                    	<a class="reldemand">
                         <img th:src="${portalHost+'/img/newMenu/serves_3.png'}" alt="">
                         <span>技术创业</span>
                         </a>

+ 0 - 7
src/main/webapp/WEB-INF/views/user/signIn.html

@@ -32,13 +32,6 @@
 						<span class="Tips "></span>
 					</div>
 					<div class="zhuce_input">
-						<img th:src="${portalHost+'/img/indedImg/enroll4.png'}" alt=""/>
-						<input type="text" name="cellCode" placeholder="手机验证码" id="photo_num" autocomplete="off" />
-						<input type="button" id="photo" value="获取验证码" disabled="disabled"/>
-						<span class="star"> * </span>
-						<span class="Tips"></span>
-					</div>
-					<div class="zhuce_input">
 						<img th:src="${portalHost+'/img/indedImg/enroll6.png'}" alt=""/>
 						<input type="password" name="userPassword" placeholder="请输入密码" id="userpassword" autocomplete="off"/>
 						<span class="star"> * </span>