Skip to content

Commit 3630401

Browse files
committed
食品页面、新闻页面完成
食品页面、新闻页面完成相应功能。
1 parent 4baf2e6 commit 3630401

11 files changed

Lines changed: 207 additions & 168 deletions

File tree

src/main/java/com/changyu/foryou/controller/FoodController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@ public String updateFoods(@RequestParam MultipartFile[] myfile,HttpServletReques
805805
foodCount=Integer.valueOf(request.getParameter("foodCount"));
806806
}
807807

808-
Short isDefault=Short.valueOf(request.getParameter("default_special"));
808+
//Short isDefault=Short.valueOf(request.getParameter("default_special"));
809809
String realPath = request.getSession().getServletContext().getRealPath("/");
810810
realPath=realPath.replace("SJFood", "MickeyImage");
811811
realPath=realPath.concat("\\food\\");
@@ -837,7 +837,7 @@ public String updateFoods(@RequestParam MultipartFile[] myfile,HttpServletReques
837837
//不存在即添加
838838
flag=foodService.insertFoodSelective(food);
839839
//只有在增加食品的时候添加默认口味才有效
840-
if (flag!=-1&&flag!=0) {
840+
/*if (flag!=-1&&flag!=0) {
841841
if(isDefault==1&&foodCount!=null){
842842
//添加默认口味
843843
FoodSpecial foodSpecial=new FoodSpecial(campusId,foodId, "默认口味", foodCount);
@@ -847,7 +847,7 @@ public String updateFoods(@RequestParam MultipartFile[] myfile,HttpServletReques
847847
return "redirect:/pages/food.html";
848848
}
849849
}
850-
}
850+
}*/
851851
}else{
852852
//存在即更新
853853
flag=foodService.updateFoodByPrimaryKeySelective(food);

src/main/java/com/changyu/foryou/controller/NewsController.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ public String uploadNewsImage(@RequestParam MultipartFile myfile, HttpServletReq
143143
String title=request.getParameter("title");
144144
String content=request.getParameter("content");
145145
Integer campusId = Integer.parseInt(request.getParameter("campusId"));
146-
147146
if(myfile.isEmpty()){
148147
System.out.println("文件未上传");
149148
}else{

src/main/java/com/changyu/foryou/filter/IsLoginFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
3636
String loginStrings = config.getInitParameter("loginStrings");
3737
String includeStrings = config.getInitParameter("includeStrings");
3838
String redirectPath = hrequest.getContextPath() + config.getInitParameter("redirectPath");
39-
String disabletestfilter = config.getInitParameter("disabletestfilter");
39+
String disabletestfilter = config.getInitParameter("disabletestfilter");
4040

4141
if (disabletestfilter.toUpperCase().equals("Y")) {
4242
chain.doFilter(request, response);

src/main/java/com/changyu/foryou/mapping/NewsMapper.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
where news_id = #{newsId,jdbcType=BIGINT}
3030
</delete>
3131
<insert id="insert" parameterType="com.changyu.foryou.model.News" >
32-
insert into news (news_id, create_time, title,
32+
insert into news (news_id, campus_id, create_time, title,
3333
img_url, content)
34-
values (#{newsId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{title,jdbcType=VARCHAR},
34+
values (#{newsId,jdbcType=BIGINT}, #{campusId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{title,jdbcType=VARCHAR},
3535
#{imgUrl,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR})
3636
</insert>
3737
<insert id="insertSelective" parameterType="com.changyu.foryou.model.News" >
@@ -111,7 +111,7 @@
111111
<select id="getPcAllNews" parameterType="java.util.Map" resultMap="BaseResultMap">
112112
select
113113
<include refid="Base_Column_List" />
114-
from news where campus_id=#{campusId}
114+
from news where campus_id=#{campusId,jdbcType=INTEGER}
115115
</select>
116116

117117
</mapper>

src/main/java/com/changyu/foryou/tools/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ public class Constants {
55
final static public String SUCCESS = "success";
66
final static public String FAILURE = "failure";
77
public static final String MESSAGE = "message";
8-
public static final String localIp = "http://120.26.76.252:8080/MickeyImage";
8+
public static final String localIp = "http://120.26.76.252:8080/foryouImage";
99
}

0 commit comments

Comments
 (0)