diff --git a/database/changesql20200619 b/database/changesql20200619 new file mode 100644 index 00000000..17ecfe34 --- /dev/null +++ b/database/changesql20200619 @@ -0,0 +1,19 @@ +CREATE TABLE `rfid_buse` ( + `id` varchar(36) NOT NULL, + `create_name` varchar(50) DEFAULT NULL COMMENT '创建人名称', + `create_by` varchar(50) DEFAULT NULL COMMENT '创建人登录名称', + `create_date` datetime DEFAULT NULL COMMENT '创建日期', + `update_name` varchar(50) DEFAULT NULL COMMENT '更新人名称', + `update_by` varchar(50) DEFAULT NULL COMMENT '更新人登录名称', + `update_date` datetime DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(50) DEFAULT NULL COMMENT '所属部门', + `sys_company_code` varchar(50) DEFAULT NULL COMMENT '所属公司', + `bpm_status` varchar(32) DEFAULT '1' COMMENT '流程状态', + `rfid_type` varchar(128) DEFAULT NULL COMMENT '类型', + `rfid_buseno` varchar(128) DEFAULT NULL COMMENT '业务编号', + `rfid_busecont` varchar(128) DEFAULT NULL COMMENT '业务内容', + `rfid_id1` varchar(128) DEFAULT NULL COMMENT 'RFID1', + `rfid_id2` varchar(128) DEFAULT NULL COMMENT 'RFID2', + `rfid_id3` varchar(128) DEFAULT NULL COMMENT 'RFID3', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; diff --git a/src/main/java/com/zzjee/rfid/controller/RfidBuseController.java b/src/main/java/com/zzjee/rfid/controller/RfidBuseController.java index 1bb5c748..aa305515 100644 --- a/src/main/java/com/zzjee/rfid/controller/RfidBuseController.java +++ b/src/main/java/com/zzjee/rfid/controller/RfidBuseController.java @@ -1,6 +1,6 @@ package com.zzjee.rfid.controller; -import com.zzjee.RFID.entity.RfidBuseEntity; -import com.zzjee.RFID.service.RfidBuseServiceI; +import com.zzjee.rfid.entity.RfidBuseEntity; +import com.zzjee.rfid.service.RfidBuseServiceI; import java.util.ArrayList; import java.util.List; import java.text.SimpleDateFormat; @@ -65,12 +65,12 @@ import java.net.URI; import org.springframework.http.MediaType; import org.springframework.web.util.UriComponentsBuilder; -/** - * @Title: Controller +/** + * @Title: Controller * @Description: RFID表 * @author onlineGenerator - * @date 2020-06-19 06:45:01 - * @version V1.0 + * @date 2020-06-19 06:54:21 + * @version V1.0 * */ @Controller @@ -87,22 +87,22 @@ public class RfidBuseController extends BaseController { private SystemService systemService; @Autowired private Validator validator; - + /** * RFID表列表 页面跳转 - * + * * @return */ @RequestMapping(params = "list") public ModelAndView list(HttpServletRequest request) { - return new ModelAndView("com/zzjee/RFID/rfidBuseList"); + return new ModelAndView("com/zzjee/rfid/rfidBuseList"); } /** * easyui AJAX请求数据 - * + * * @param request * @param response * @param dataGrid @@ -131,10 +131,10 @@ public class RfidBuseController extends BaseController { this.rfidBuseService.getDataGridReturn(cq, true); TagUtil.datagrid(response, dataGrid); } - + /** * 删除RFID表 - * + * * @return */ @RequestMapping(params = "doDel") @@ -155,10 +155,10 @@ public class RfidBuseController extends BaseController { j.setMsg(message); return j; } - + /** * 批量删除RFID表 - * + * * @return */ @RequestMapping(params = "doBatchDel") @@ -169,7 +169,7 @@ public class RfidBuseController extends BaseController { message = "RFID表删除成功"; try{ for(String id:ids.split(",")){ - RfidBuseEntity rfidBuse = systemService.getEntity(RfidBuseEntity.class, + RfidBuseEntity rfidBuse = systemService.getEntity(RfidBuseEntity.class, id ); rfidBuseService.delete(rfidBuse); @@ -187,7 +187,7 @@ public class RfidBuseController extends BaseController { /** * 添加RFID表 - * + * * @param ids * @return */ @@ -208,10 +208,10 @@ public class RfidBuseController extends BaseController { j.setMsg(message); return j; } - + /** * 更新RFID表 - * + * * @param ids * @return */ @@ -234,11 +234,11 @@ public class RfidBuseController extends BaseController { j.setMsg(message); return j; } - + /** * RFID表新增页面跳转 - * + * * @return */ @RequestMapping(params = "goAdd") @@ -247,11 +247,11 @@ public class RfidBuseController extends BaseController { rfidBuse = rfidBuseService.getEntity(RfidBuseEntity.class, rfidBuse.getId()); req.setAttribute("rfidBusePage", rfidBuse); } - return new ModelAndView("com/zzjee/RFID/rfidBuse-add"); + return new ModelAndView("com/zzjee/rfid/rfidBuse-add"); } /** * RFID表编辑页面跳转 - * + * * @return */ @RequestMapping(params = "goUpdate") @@ -260,12 +260,12 @@ public class RfidBuseController extends BaseController { rfidBuse = rfidBuseService.getEntity(RfidBuseEntity.class, rfidBuse.getId()); req.setAttribute("rfidBusePage", rfidBuse); } - return new ModelAndView("com/zzjee/RFID/rfidBuse-update"); + return new ModelAndView("com/zzjee/rfid/rfidBuse-update"); } - + /** * 导入功能跳转 - * + * * @return */ @RequestMapping(params = "upload") @@ -273,10 +273,10 @@ public class RfidBuseController extends BaseController { req.setAttribute("controller_name","rfidBuseController"); return new ModelAndView("common/upload/pub_excel_upload"); } - + /** * 导出excel - * + * * @param request * @param response */ @@ -295,7 +295,7 @@ public class RfidBuseController extends BaseController { } /** * 导出excel 使模板 - * + * * @param request * @param response */ @@ -309,13 +309,13 @@ public class RfidBuseController extends BaseController { modelMap.put(NormalExcelConstants.DATA_LIST,new ArrayList()); return NormalExcelConstants.JEECG_EXCEL_VIEW; } - + @SuppressWarnings("unchecked") @RequestMapping(params = "importExcel", method = RequestMethod.POST) @ResponseBody public AjaxJson importExcel(HttpServletRequest request, HttpServletResponse response) { AjaxJson j = new AjaxJson(); - + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; Map fileMap = multipartRequest.getFileMap(); for (Map.Entry entity : fileMap.entrySet()) { @@ -343,14 +343,14 @@ public class RfidBuseController extends BaseController { } return j; } - + @RequestMapping(method = RequestMethod.GET) @ResponseBody public List list() { List listRfidBuses=rfidBuseService.getList(RfidBuseEntity.class); return listRfidBuses; } - + @RequestMapping(value = "/{id}", method = RequestMethod.GET) @ResponseBody public ResponseEntity get(@PathVariable("id") String id) { diff --git a/src/main/java/com/zzjee/rfid/entity/RfidBuseEntity.java b/src/main/java/com/zzjee/rfid/entity/RfidBuseEntity.java index 1c07b0cb..17c09c77 100644 --- a/src/main/java/com/zzjee/rfid/entity/RfidBuseEntity.java +++ b/src/main/java/com/zzjee/rfid/entity/RfidBuseEntity.java @@ -22,7 +22,7 @@ import org.jeecgframework.poi.excel.annotation.Excel; * @Title: Entity * @Description: RFID表 * @author onlineGenerator - * @date 2020-06-19 06:45:01 + * @date 2020-06-19 06:54:21 * @version V1.0 * */ diff --git a/src/main/java/com/zzjee/rfid/service/RfidBuseServiceI.java b/src/main/java/com/zzjee/rfid/service/RfidBuseServiceI.java index 44f1fbc5..354d4b7f 100644 --- a/src/main/java/com/zzjee/rfid/service/RfidBuseServiceI.java +++ b/src/main/java/com/zzjee/rfid/service/RfidBuseServiceI.java @@ -1,15 +1,15 @@ package com.zzjee.rfid.service; -import com.zzjee.RFID.entity.RfidBuseEntity; +import com.zzjee.rfid.entity.RfidBuseEntity; import org.jeecgframework.core.common.service.CommonService; import java.io.Serializable; public interface RfidBuseServiceI extends CommonService{ - + public void delete(RfidBuseEntity entity) throws Exception; - + public Serializable save(RfidBuseEntity entity) throws Exception; - + public void saveOrUpdate(RfidBuseEntity entity) throws Exception; - + } diff --git a/src/main/java/com/zzjee/rfid/service/impl/RfidBuseServiceImpl.java b/src/main/java/com/zzjee/rfid/service/impl/RfidBuseServiceImpl.java index 5d9d482a..813694b5 100644 --- a/src/main/java/com/zzjee/rfid/service/impl/RfidBuseServiceImpl.java +++ b/src/main/java/com/zzjee/rfid/service/impl/RfidBuseServiceImpl.java @@ -1,7 +1,7 @@ package com.zzjee.rfid.service.impl; -import com.zzjee.RFID.service.RfidBuseServiceI; +import com.zzjee.rfid.service.RfidBuseServiceI; import org.jeecgframework.core.common.service.impl.CommonServiceImpl; -import com.zzjee.RFID.entity.RfidBuseEntity; +import com.zzjee.rfid.entity.RfidBuseEntity; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; @@ -17,26 +17,26 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; @Transactional public class RfidBuseServiceImpl extends CommonServiceImpl implements RfidBuseServiceI { - + public void delete(RfidBuseEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - + public Serializable save(RfidBuseEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - + public void saveOrUpdate(RfidBuseEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); } - + /** * 新增操作增强业务 * @param t @@ -45,7 +45,7 @@ public class RfidBuseServiceImpl extends CommonServiceImpl implements RfidBuseSe private void doAddBus(RfidBuseEntity t) throws Exception{ //-----------------sql增强 start---------------------------- //-----------------sql增强 end------------------------------ - + //-----------------java增强 start--------------------------- //-----------------java增强 end----------------------------- } @@ -57,7 +57,7 @@ public class RfidBuseServiceImpl extends CommonServiceImpl implements RfidBuseSe private void doUpdateBus(RfidBuseEntity t) throws Exception{ //-----------------sql增强 start---------------------------- //-----------------sql增强 end------------------------------ - + //-----------------java增强 start--------------------------- //-----------------java增强 end----------------------------- } @@ -69,11 +69,11 @@ public class RfidBuseServiceImpl extends CommonServiceImpl implements RfidBuseSe private void doDelBus(RfidBuseEntity t) throws Exception{ //-----------------sql增强 start---------------------------- //-----------------sql增强 end------------------------------ - + //-----------------java增强 start--------------------------- //-----------------java增强 end----------------------------- } - + private Map populationMap(RfidBuseEntity t){ Map map = new HashMap(); map.put("id", t.getId()); @@ -94,7 +94,7 @@ public class RfidBuseServiceImpl extends CommonServiceImpl implements RfidBuseSe map.put("rfid_id3", t.getRfidId3()); return map; } - + /** * 替换sql中的变量 * @param sql @@ -121,7 +121,7 @@ public class RfidBuseServiceImpl extends CommonServiceImpl implements RfidBuseSe sql = sql.replace("#{UUID}",UUID.randomUUID().toString()); return sql; } - + /** * 执行JAVA增强 */ @@ -142,7 +142,7 @@ public class RfidBuseServiceImpl extends CommonServiceImpl implements RfidBuseSe } catch (Exception e) { e.printStackTrace(); throw new Exception("执行JAVA增强出现异常！"); - } + } } } -} +} \ No newline at end of file diff --git a/src/main/webapp/webpage/com/zzjee/rfid/rfidBuse-add.jsp b/src/main/webapp/webpage/com/zzjee/rfid/rfidBuse-add.jsp index 2a221679..c0eb9585 100644 --- a/src/main/webapp/webpage/com/zzjee/rfid/rfidBuse-add.jsp +++ b/src/main/webapp/webpage/com/zzjee/rfid/rfidBuse-add.jsp @@ -143,4 +143,4 @@ - + diff --git a/src/main/webapp/webpage/com/zzjee/rfid/rfidBuse-update.jsp b/src/main/webapp/webpage/com/zzjee/rfid/rfidBuse-update.jsp index f8950e10..0a7602e5 100644 --- a/src/main/webapp/webpage/com/zzjee/rfid/rfidBuse-update.jsp +++ b/src/main/webapp/webpage/com/zzjee/rfid/rfidBuse-update.jsp @@ -135,4 +135,4 @@ - + diff --git a/src/main/webapp/webpage/com/zzjee/rfid/rfidBuseList.jsp b/src/main/webapp/webpage/com/zzjee/rfid/rfidBuseList.jsp index 6841f7e0..cc5daf5b 100644 --- a/src/main/webapp/webpage/com/zzjee/rfid/rfidBuseList.jsp +++ b/src/main/webapp/webpage/com/zzjee/rfid/rfidBuseList.jsp @@ -32,7 +32,7 @@ - +