diff --git a/src/com/fh/controller/api/ApiServer.java b/src/com/fh/controller/api/ApiServer.java index 1362ce8..b98ca92 100644 --- a/src/com/fh/controller/api/ApiServer.java +++ b/src/com/fh/controller/api/ApiServer.java @@ -10,10 +10,9 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.fh.controller.base.BaseController; import com.fh.service.sunvote.basestation.BasestationManager; +import com.fh.service.sunvote.keypad.KeypadManager; import com.fh.service.sunvote.school.SchoolManager; -import com.fh.util.Jurisdiction; import com.fh.util.PageData; -import com.google.gson.Gson; @Controller @RequestMapping(value="/api") @@ -25,26 +24,80 @@ public class ApiServer extends BaseController { @Resource(name="basestationService") private BasestationManager basestationService; + @Resource(name="keypadService") + private KeypadManager keypadService; - @RequestMapping(value="/school" ,produces="application/json;charset=UTF-8") + + @RequestMapping(value="/school/list" ,produces="application/json;charset=UTF-8") @ResponseBody - public Object school() throws Exception{ + public Object schoolList() throws Exception{ PageData pd = this.getPageData(); String id = pd.getString("id"); if(id != null && !"".equals(id)){ pd.put("SCHOOL_ID", pd.getString("id")); PageData ret = schoolService.findById(pd); - Gson gson = new Gson(); - return gson.toJson(ret); + ResponseGson res = new ResponseGson(); + res.setData(ret); + return res.toJson(); }else{ List ret = schoolService.listAll(pd); - Gson gson = new Gson(); - return gson.toJson(ret); + ResponseGson> res = new ResponseGson(); + res.setData(ret); + return res.toJson(); } - + } + @RequestMapping(value="/school/add" ,produces="application/json;charset=UTF-8") + @ResponseBody + public Object schoolAdd() throws Exception{ + PageData pd = this.getPageData(); + ResponseGson res = new ResponseGson(); + try { + if (pd.get("name") != null) { + schoolService.save(pd); + res.setData(pd); + } else { + res.setDataError(); + } + }catch(Exception e){ + res.setDataError(); + } + return res.toJson(); + } + + @RequestMapping(value="/school/delete" ,produces="application/json;charset=UTF-8") + @ResponseBody + public Object schoolDelete() throws Exception{ + ResponseGson res = new ResponseGson(); + PageData pd = this.getPageData(); + String id = pd.getString("id"); + if(id != null && !"".equals(id)){ + pd.put("SCHOOL_ID", pd.getString("id")); + schoolService.delete(pd); + res.setData(pd); + }else{ + res.setDataError(); + } + return res.toJson(); + } + + @RequestMapping(value="/school/update" ,produces="application/json;charset=UTF-8") + @ResponseBody + public Object schoolUpdate() throws Exception{ + ResponseGson res = new ResponseGson(); + PageData pd = this.getPageData(); + String id = pd.getString("id"); + if(id != null && !"".equals(id)){ + pd.put("SCHOOL_ID", pd.getString("id")); + schoolService.edit(pd); + res.setData(pd); + }else{ + res.setDataError(); + } + return res.toJson(); } - @RequestMapping(value="/basestation" ,produces="application/json;charset=UTF-8") + + @RequestMapping(value="/basestation/list" ,produces="application/json;charset=UTF-8") @ResponseBody public Object basestation() throws Exception{ PageData pd = this.getPageData(); @@ -52,12 +105,34 @@ public class ApiServer extends BaseController { if(id != null && !"".equals(id)){ pd.put("BASESTATION_ID", pd.getString("id")); PageData ret = basestationService.findById(pd); - Gson gson = new Gson(); - return gson.toJson(ret); + ResponseGson res = new ResponseGson(); + res.setData(ret); + return res.toJson(); }else{ List ret = basestationService.listAll(pd); - Gson gson = new Gson(); - return gson.toJson(ret); + ResponseGson> res = new ResponseGson(); + res.setData(ret); + return res.toJson(); + } + + } + + @RequestMapping(value="/keypad/list" ,produces="application/json;charset=UTF-8") + @ResponseBody + public Object keypad() throws Exception{ + PageData pd = this.getPageData(); + String id = pd.getString("id"); + if(id != null && !"".equals(id)){ + pd.put("KEYPAD_ID", pd.getString("id")); + PageData ret = keypadService.findById(pd); + ResponseGson res = new ResponseGson(); + res.setData(ret); + return res.toJson(); + }else{ + List ret = keypadService.listAll(pd); + ResponseGson> res = new ResponseGson(); + res.setData(ret); + return res.toJson(); } } diff --git a/src/com/fh/controller/app/appuser/IntAppuserController.java b/src/com/fh/controller/app/appuser/IntAppuserController.java index 554b7c2..42c366a 100644 --- a/src/com/fh/controller/app/appuser/IntAppuserController.java +++ b/src/com/fh/controller/app/appuser/IntAppuserController.java @@ -16,7 +16,7 @@ import com.fh.util.PageData; import com.fh.util.Tools; -/**@author FH Q313596790 +/**@author Elvis * 会员-接口类 * 相关参数协议： * 00 请求失败 diff --git a/src/com/fh/controller/app/redis/RedisDemoController.java b/src/com/fh/controller/app/redis/RedisDemoController.java index f83e85e..75261de 100644 --- a/src/com/fh/controller/app/redis/RedisDemoController.java +++ b/src/com/fh/controller/app/redis/RedisDemoController.java @@ -19,7 +19,7 @@ import com.fh.util.AppUtil; import com.fh.util.PageData; /** RedisDemo - * @author FH Q313596790 + * @author Elvis * 2016.5.8 */ @Controller diff --git a/src/com/fh/controller/app/sysuser/SysUserController.java b/src/com/fh/controller/app/sysuser/SysUserController.java index ef717be..5aff53b 100644 --- a/src/com/fh/controller/app/sysuser/SysUserController.java +++ b/src/com/fh/controller/app/sysuser/SysUserController.java @@ -21,7 +21,7 @@ import com.fh.util.PageData; import com.fh.util.Tools; -/**@author FH Q313596790 +/**@author Elvis * 系统用户-接口类 * 相关参数协议： * 00 请求失败 diff --git a/src/com/fh/controller/base/BaseController.java b/src/com/fh/controller/base/BaseController.java index 4392a9b..1dc35bd 100644 --- a/src/com/fh/controller/base/BaseController.java +++ b/src/com/fh/controller/base/BaseController.java @@ -17,7 +17,7 @@ import com.fh.util.PageData; import com.fh.util.UuidUtil; /** - * @author FH Q313596790 + * @author Elvis * 修改时间：2015、12、11 */ public class BaseController { diff --git a/src/com/fh/controller/dst/datasource2/DataSource2Controller.java b/src/com/fh/controller/dst/datasource2/DataSource2Controller.java index b75d6db..361f531 100644 --- a/src/com/fh/controller/dst/datasource2/DataSource2Controller.java +++ b/src/com/fh/controller/dst/datasource2/DataSource2Controller.java @@ -26,7 +26,7 @@ import com.fh.service.dst.datasource2.DataSource2Manager; /** * 说明：第2数据源例子 - * 创建人：FH Q313596790 + * 创建人：Elvis * 创建时间：2016-04-29 */ @Controller diff --git a/src/com/fh/controller/fhdb/brdb/BRdbController.java b/src/com/fh/controller/fhdb/brdb/BRdbController.java index f0ff06c..b414f30 100644 --- a/src/com/fh/controller/fhdb/brdb/BRdbController.java +++ b/src/com/fh/controller/fhdb/brdb/BRdbController.java @@ -32,7 +32,7 @@ import com.fh.service.fhdb.brdb.BRdbManager; /** * 说明：数据库管理(备份和还原) - * 创建人：FH Q313596790 + * 创建人：Elvis * 创建时间：2016-03-30 */ @Controller diff --git a/src/com/fh/controller/fhdb/sqledit/SQLeditController.java b/src/com/fh/controller/fhdb/sqledit/SQLeditController.java index a01ee81..10fb50e 100644 --- a/src/com/fh/controller/fhdb/sqledit/SQLeditController.java +++ b/src/com/fh/controller/fhdb/sqledit/SQLeditController.java @@ -26,7 +26,7 @@ import com.fh.util.PageData; /** * 说明：SQL编辑器 - * 创建人：FH Q313596790 + * 创建人：Elvis * 创建时间：2016-03-30 */ @Controller diff --git a/src/com/fh/controller/fhdb/timingbackup/TimingBackUpController.java b/src/com/fh/controller/fhdb/timingbackup/TimingBackUpController.java index 0fd6673..2b473af 100644 --- a/src/com/fh/controller/fhdb/timingbackup/TimingBackUpController.java +++ b/src/com/fh/controller/fhdb/timingbackup/TimingBackUpController.java @@ -32,7 +32,7 @@ import com.fh.service.fhdb.timingbackup.TimingBackUpManager; /** * 说明：定时备份 - * 创建人：FH Q313596790 + * 创建人：Elvis * 创建时间：2016-04-09 */ @Controller diff --git a/src/com/fh/controller/fhoa/datajur/DatajurController.java b/src/com/fh/controller/fhoa/datajur/DatajurController.java index 22ef85a..5c0d7ce 100644 --- a/src/com/fh/controller/fhoa/datajur/DatajurController.java +++ b/src/com/fh/controller/fhoa/datajur/DatajurController.java @@ -25,7 +25,7 @@ import com.fh.service.fhoa.department.DepartmentManager; /** * 说明：组织数据权限表 - * 创建人：FH Q313596790 + * 创建人：Elvis * 创建时间：2016-04-26 */ @Controller diff --git a/src/com/fh/controller/fhoa/department/DepartmentController.java b/src/com/fh/controller/fhoa/department/DepartmentController.java index e599e22..e0cd820 100644 --- a/src/com/fh/controller/fhoa/department/DepartmentController.java +++ b/src/com/fh/controller/fhoa/department/DepartmentController.java @@ -30,7 +30,7 @@ import com.fh.service.fhoa.department.DepartmentManager; /** * 说明：组织机构 - * 创建人：FH Q313596790 + * 创建人：Elvis * 创建时间：2015-12-16 */ @Controller diff --git a/src/com/fh/controller/fhoa/fhfile/FhfileController.java b/src/com/fh/controller/fhoa/fhfile/FhfileController.java index da307ee..d3a5d8f 100644 --- a/src/com/fh/controller/fhoa/fhfile/FhfileController.java +++ b/src/com/fh/controller/fhoa/fhfile/FhfileController.java @@ -35,7 +35,7 @@ import com.fh.service.fhoa.fhfile.FhfileManager; /** * 说明：文件管理 - * 创建人：FH Q313596790 + * 创建人：Elvis * 创建时间：2016-05-27 */ @Controller diff --git a/src/com/fh/controller/fhoa/staff/StaffController.java b/src/com/fh/controller/fhoa/staff/StaffController.java index e255e43..f9e1a55 100644 --- a/src/com/fh/controller/fhoa/staff/StaffController.java +++ b/src/com/fh/controller/fhoa/staff/StaffController.java @@ -34,7 +34,7 @@ import com.fh.service.fhoa.staff.StaffManager; /** * 说明：员工管理 - * 创建人：FH Q313596790 + * 创建人：Elvis * 创建时间：2016-04-23 */ @Controller diff --git a/src/com/fh/controller/sunvote/teachingmaterial/TeachingMaterialController.java b/src/com/fh/controller/sunvote/teachingmaterial/TeachingMaterialController.java index 43d1cde..6a118b8 100644 --- a/src/com/fh/controller/sunvote/teachingmaterial/TeachingMaterialController.java +++ b/src/com/fh/controller/sunvote/teachingmaterial/TeachingMaterialController.java @@ -27,7 +27,7 @@ import com.fh.service.sunvote.teachingmaterial.TeachingMaterialManager; /** * 说明：教材 - * 创建人：FH Q313596790 + * 创建人：Elvis * 创建时间：2018-04-18 */ @Controller diff --git a/src/com/fh/dao/AbstractBaseRedisDao.java b/src/com/fh/dao/AbstractBaseRedisDao.java index 0832edb..da625ec 100644 --- a/src/com/fh/dao/AbstractBaseRedisDao.java +++ b/src/com/fh/dao/AbstractBaseRedisDao.java @@ -7,7 +7,7 @@ import org.springframework.data.redis.serializer.RedisSerializer; /** * redis Dao - * @author FH Q313596790 + * @author Elvis * 修改时间：2016、5、2 */ public abstract class AbstractBaseRedisDao { diff --git a/src/com/fh/dao/DAO.java b/src/com/fh/dao/DAO.java index 1314c00..1c05cb2 100644 --- a/src/com/fh/dao/DAO.java +++ b/src/com/fh/dao/DAO.java @@ -1,6 +1,6 @@ package com.fh.dao; /** - * @author FH Q313596790 + * @author Elvis * 修改时间：2015、12、11 */ public interface DAO { diff --git a/src/com/fh/dao/DaoSupport.java b/src/com/fh/dao/DaoSupport.java index ef6a8dd..99a1491 100644 --- a/src/com/fh/dao/DaoSupport.java +++ b/src/com/fh/dao/DaoSupport.java @@ -10,7 +10,7 @@ import org.apache.ibatis.session.SqlSessionFactory; import org.mybatis.spring.SqlSessionTemplate; import org.springframework.stereotype.Repository; /** - * @author FH Q313596790 + * @author Elvis * 修改时间：2015、12、11 */ @Repository("daoSupport") diff --git a/src/com/fh/dao/redis/RedisDao.java b/src/com/fh/dao/redis/RedisDao.java index 27661ea..cba68e8 100644 --- a/src/com/fh/dao/redis/RedisDao.java +++ b/src/com/fh/dao/redis/RedisDao.java @@ -7,7 +7,7 @@ import java.util.Set; /** * 说明： redis - * 创建人：FH Q313596790 + * 创建人：Elvis * 创建时间：2016-05-2 * @version */