Skip to content
This repository has been archived by the owner on May 7, 2019. It is now read-only.

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
orzyyyy committed May 20, 2018
1 parent 74cc081 commit e761a2e
Show file tree
Hide file tree
Showing 25 changed files with 2,490 additions and 2,290 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4,657 changes: 2,423 additions & 2,234 deletions .metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi

Large diffs are not rendered by default.

Binary file modified .metadata/.plugins/org.eclipse.jdt.core/301807071.index
Binary file not shown.
Binary file modified .metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
Binary file not shown.
6 changes: 3 additions & 3 deletions .metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
INDEX VERSION 1.130+E:\Github\Memo\.metadata\.plugins\org.eclipse.jdt.core
753906991.index
3049897401.index
543270104.index
1855818878.index
3440265576.index
325010333.index
301807071.index
Expand All @@ -16,8 +16,8 @@ INDEX VERSION 1.130+E:\Github\Memo\.metadata\.plugins\org.eclipse.jdt.core
1384772183.index
3824413116.index
1262980392.index
753132607.index
1903046315.index
753132607.index
815656459.index
767966408.index
1737026339.index
Expand All @@ -44,4 +44,4 @@ INDEX VERSION 1.130+E:\Github\Memo\.metadata\.plugins\org.eclipse.jdt.core
1374019732.index
695066146.index
4147724040.index
1855818878.index
543270104.index
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion .metadata/version.ini
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#Sat May 19 10:58:55 CST 2018
#Sun May 20 09:55:34 CST 2018
org.eclipse.core.runtime=2
org.eclipse.platform=4.7.3.v20180330-0640
Binary file not shown.
38 changes: 22 additions & 16 deletions Memo/src/main/java/com/orz/controller/GbfController.java
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
package com.orz.controller;

import java.util.Date;
import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.orz.po.GBF_Item_Info;
import com.orz.service.GbfItemService;

Expand All @@ -27,20 +31,22 @@ public String getPage(Model model, @RequestParam(value = "patch") String patch)
return JSON.toJSONString(items);
}

// @RequestMapping(value = "/i_item", method = RequestMethod.POST)
// @ResponseBody
// @CrossOrigin
// public String i_item_info(Model model, @RequestParam(value = "data") String
// items,
// @RequestParam("user_id") String user_id) {
// List<GBF_Item_Info> giis = JSONArray.parseArray(items, GBF_Item_Info.class);
//
// try {
// itemService.save(giis, user_id, new Date());
//
// return "success";
// } catch (Exception e) {
// return e.toString();
// }
// }
@RequestMapping(value = "/i_item", method = RequestMethod.POST)
@ResponseBody
@CrossOrigin
public String i_item_info(Model model, @RequestParam(value = "data") String items,
@RequestParam("user_id") String user_id) {
List<GBF_Item_Info> giis = JSONArray.parseArray(items, GBF_Item_Info.class);

itemService.save(giis, user_id, new Date());

return "success";
// try {
// itemService.save(giis, user_id, new Date());
//
// return "success";
// } catch (Exception e) {
// return e.toString();
// }
}
}
3 changes: 2 additions & 1 deletion Memo/src/main/java/com/orz/dao/Base_User_Dao.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@

import com.orz.po.Base_User;

public interface Base_User_Dao extends GenericDao<Base_User, Long> {
public interface Base_User_Dao {
public Base_User getByGbfId(String gbf_id);
}
1 change: 1 addition & 0 deletions Memo/src/main/java/com/orz/dao/Gbf_Info_Dao.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ public interface Gbf_Info_Dao {

public List<GBF_Item_Info> getByPatch(String patch);

public void save(GBF_Item_Info gii);
}
4 changes: 3 additions & 1 deletion Memo/src/main/java/com/orz/service/GbfItemService.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package com.orz.service;

import java.util.Date;
import java.util.List;

import com.orz.po.GBF_Item_Info;

public interface GbfItemService {
// public void save(List<GBF_Item_Info> giis, String user_id, Date now);
public void save(List<GBF_Item_Info> giis, String user_id, Date now);

public GBF_Item_Info getById(int id);

public List<GBF_Item_Info> getByPatch(String patch);
Expand Down
3 changes: 0 additions & 3 deletions Memo/src/main/java/com/orz/service/UserService.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
package com.orz.service;

import com.orz.po.Base_User;

public interface UserService {
public Base_User getUserById(int id);
}
35 changes: 18 additions & 17 deletions Memo/src/main/java/com/orz/service/impl/GbfItemServiceImpl.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
package com.orz.service.impl;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.orz.dao.Base_User_Dao;
import com.orz.dao.Gbf_Info_Dao;
import com.orz.po.Base_User;
import com.orz.po.GBF_Item_Info;
import com.orz.service.GbfItemService;

Expand All @@ -16,23 +20,20 @@ public class GbfItemServiceImpl implements GbfItemService {
@Autowired
private Gbf_Info_Dao giDao;

// @Autowired
// private Base_User_Dao userService;

// public void save(List<GBF_Item_Info> giis, String gbf_id, Date now) {
// // Base_User user = userService.get(gbf_id);
// // System.out.println(user.getId());
//
// for (GBF_Item_Info gii : giis) {
// gii.setPatch(gbf_id + new SimpleDateFormat("yyyyMMddHHmmss").format(now));
// gii.setCreate_time(now);
// // gii.setUser_id(user.getId());
// gii.setUser_id(1);
//
// System.out.println(gii.getName());
// itemService.save(gii);
// }
// }
@Autowired
private Base_User_Dao budDao;

public void save(List<GBF_Item_Info> giis, String gbf_id, Date now) {
Base_User user = budDao.getByGbfId(gbf_id);

for (GBF_Item_Info gii : giis) {
gii.setPatch(gbf_id + new SimpleDateFormat("yyyyMMddHHmmss").format(now));
gii.setCreate_time(now);
gii.setUser_id(user.getId());

giDao.save(gii);
}
}

public GBF_Item_Info getById(int id) {
return giDao.getById(id);
Expand Down
9 changes: 0 additions & 9 deletions Memo/src/main/java/com/orz/service/impl/UserServiceImpl.java
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@
package com.orz.service.impl;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.orz.dao.Base_User_Dao;
import com.orz.po.Base_User;
import com.orz.service.UserService;

@Service
@Transactional
public class UserServiceImpl implements UserService {
@Autowired
private Base_User_Dao userService;

public Base_User getUserById(int id) {
return userService.get(id);
}
}
7 changes: 7 additions & 0 deletions Memo/src/main/resources/mapper/Base_User.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?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.orz.dao.Base_User_Dao">
<select id="getByGbfId" resultType="com.orz.po.Base_User" parameterType="java.lang.String">
select * from Base_User where gbf_id = #{ gbf_id }
</select>
</mapper>
5 changes: 5 additions & 0 deletions Memo/src/main/resources/mapper/Gbf_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,9 @@
<select id="getByPatch" resultType="com.orz.po.GBF_Item_Info" parameterType="java.lang.String">
select * from GBF_Item_Info where patch = #{ patch }
</select>

<select id="save" parameterType="com.orz.po.GBF_Item_Info">
insert into GBF_Item_Info (patch, category_type, image, is_display_select_item, item_id, name, number, user_id, create_time)
values(#{ patch }, #{ category_type }, #{ image }, #{ is_display_select_item }, #{ item_id }, #{ name }, #{ number }, #{ user_id }, #{ create_time })
</select>
</mapper>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Generated by Maven Integration for Eclipse
#Sat May 19 10:59:10 CST 2018
#Sun May 20 09:55:53 CST 2018
m2e.projectLocation=E\:\\Github\\Memo\\Memo
m2e.projectName=Memo
groupId=com.orz
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
com\orz\controller\TestController.class
com\orz\po\GBF_Item_Info.class
com\orz\po\Base_User.class
com\orz\controller\GbfController.class
com\orz\service\impl\GbfItemServiceImpl.class
com\orz\service\UserService.class
com\orz\dao\Gbf_Info_Dao.class
com\orz\service\GbfItemService.class
com\orz\dao\GenericDao.class
com\orz\util\DateUtil.class
com\orz\dao\Base_User_Dao.class
com\orz\service\impl\UserServiceImpl.class
com\orz\test\Test.class
com\orz\controller\GbfController.class
com\orz\dao\Gbf_Info_Dao.class
com\orz\util\DateUtil.class
com\orz\service\impl\UserServiceImpl.class

0 comments on commit e761a2e

Please sign in to comment.