朱兆平 / spring cloud基础开发框架 · 提交

转到一个项目

作者 shenhailong
提交 797c01a65ac9173fab475ec2d44759a8566739b0 1 个父辈 1650f7e2

删除 imf 开启getway 生活保障部门 安全巡检 备用钥匙 设备维修 等增删改查

内嵌 并排对比
正在显示 28 个修改的文件 包含 1270 行增加 和 399 行删除
... ... @@ -12,12 +12,15 @@ spring:
#静态资源，设置上传文件的访问，
static-path-pattern: /**
resources:
static-locations: classpath:/META-INF/resources/,classpath:/static,classpath:/resources/,file:${web.upload-path}
application:
name: hqpt-user-center
redis:
host: 192.168.1.53
port: 6379
jackson:
serialization:
FAIL_ON_EMPTY_BEANS: false
... ...
package com.tianbo.warehouse.controller.staff;
import com.github.pagehelper.PageInfo;
import com.tianbo.warehouse.annotation.LogAnnotation;
import com.tianbo.warehouse.controller.response.ResultJson;
import com.tianbo.warehouse.model.StaffApartmentSpareKey;
import com.tianbo.warehouse.model.StaffSecurityInspection;
import com.tianbo.warehouse.service.satff.KeyService;
import com.tianbo.warehouse.service.satff.StaffSecurityInspectionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
@RestController
@RequestMapping("/key")
public class KeyController {
@Autowired
KeyService keyService;
@GetMapping("/list")
public PageInfo<StaffApartmentSpareKey> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
int pageNum,
@RequestParam(value = "pageSize",required = false,defaultValue = "5")
int pageSize,
@RequestParam(value = "staffname", required = false)
String staffname){
return keyService.findAll(pageNum,pageSize,staffname);
}
@LogAnnotation(moduleName = "职工公寓备用钥匙使用记录管理",operate = "职工公寓备用钥匙使用记录添加")
@PostMapping("/add")
public ResultJson add(@RequestBody StaffApartmentSpareKey staffApartmentSpareKey){
int i =keyService.insertSelective(staffApartmentSpareKey);
ResultJson resultJson = new ResultJson();
if (1==i){
resultJson = new ResultJson("200","添加成功");
}else {
resultJson = new ResultJson("500","insert faild");
}
return resultJson;
}
@LogAnnotation(moduleName = "职工公寓备用钥匙使用记录管理",operate = "职工公寓备用钥匙使用记录修改")
@PutMapping("/edit")
@ResponseBody
public ResultJson edit(@RequestBody @Valid StaffApartmentSpareKey staffApartmentSpareKey){
int i =keyService.updateByPrimaryKeySelective(staffApartmentSpareKey);
ResultJson resultJson = new ResultJson();
if (1==i){
resultJson = new ResultJson("200","修改成功");
}else {
resultJson = new ResultJson("500","insert faild");
}
return resultJson;
}
@LogAnnotation(moduleName = "职工公寓备用钥匙使用记录管理",operate = "职工公寓备用钥匙使用记录删除")
@DeleteMapping("/del")
public ResultJson reomve(@RequestBody StaffApartmentSpareKey staffApartmentSpareKey, HttpServletRequest request, HttpServletResponse response){
int i =keyService.deleteByPrimaryKey(staffApartmentSpareKey.getId());
ResultJson resultJson = new ResultJson();
if (1==i){
resultJson = new ResultJson("200","删除成功");
}else {
resultJson = new ResultJson("500","insert faild");
}
return resultJson;
}
@LogAnnotation(moduleName = "职工公寓备用钥匙使用记录管理",operate = "职工公寓备用钥匙使用记录删除")
@GetMapping("/batchremove")
public ResultJson reomve(String ids, HttpServletRequest request, HttpServletResponse response){
ResultJson resultJson = new ResultJson();
if (keyService.deleteByPrimaryKey(ids)>0){
resultJson = new ResultJson("200","删除成功");
}else {
resultJson = new ResultJson("500","insert faild");
}
return resultJson;
}
}
... ...
package com.tianbo.warehouse.controller.staff;
import com.github.pagehelper.PageInfo;
import com.tianbo.warehouse.annotation.LogAnnotation;
import com.tianbo.warehouse.controller.response.ResultJson;
import com.tianbo.warehouse.model.StaffApartmentMaintain;
import com.tianbo.warehouse.model.StaffApartmentSpareKey;
import com.tianbo.warehouse.service.satff.KeyService;
import com.tianbo.warehouse.service.satff.MaintainService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
@RestController
@RequestMapping("/maintain")
public class MaintainController {
@Autowired
MaintainService maintainService;
@GetMapping("/list")
public PageInfo<StaffApartmentMaintain> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
int pageNum,
@RequestParam(value = "pageSize",required = false,defaultValue = "5")
int pageSize,
@RequestParam(value = "repairsname", required = false)
String repairsname){
return maintainService.findAll(pageNum,pageSize,repairsname);
}
@LogAnnotation(moduleName = "职工公寓设施设备维修记录管理",operate = "职工公寓设施设备维修记录添加")
@PostMapping("/add")
public ResultJson add(@RequestBody StaffApartmentMaintain staffApartmentMaintain){
int i =maintainService.insertSelective(staffApartmentMaintain);
ResultJson resultJson = new ResultJson();
if (1==i){
resultJson = new ResultJson("200","添加成功");
}else {
resultJson = new ResultJson("500","insert faild");
}
return resultJson;
}
@LogAnnotation(moduleName = "职工公寓设施设备维修记录管理",operate = "职工公寓设施设备维修记录修改")
@PutMapping("/edit")
@ResponseBody
public ResultJson edit(@RequestBody @Valid StaffApartmentMaintain staffApartmentMaintain){
int i =maintainService.updateByPrimaryKeySelective(staffApartmentMaintain);
ResultJson resultJson = new ResultJson();
if (1==i){
resultJson = new ResultJson("200","修改成功");
}else {
resultJson = new ResultJson("500","insert faild");
}
return resultJson;
}
@LogAnnotation(moduleName = "职工公寓设施设备维修记录管理",operate = "职工公寓设施设备维修记录删除")
@DeleteMapping("/del")
public ResultJson reomve(@RequestBody StaffApartmentMaintain staffApartmentMaintain, HttpServletRequest request, HttpServletResponse response){
int i =maintainService.deleteByPrimaryKey(staffApartmentMaintain.getId());
ResultJson resultJson = new ResultJson();
if (1==i){
resultJson = new ResultJson("200","删除成功");
}else {
resultJson = new ResultJson("500","insert faild");
}
return resultJson;
}
@LogAnnotation(moduleName = "职工公寓设施设备维修记录管理",operate = "职工公寓设施设备维修记录删除")
@GetMapping("/batchremove")
public ResultJson reomve(String ids, HttpServletRequest request, HttpServletResponse response){
ResultJson resultJson = new ResultJson();
if (maintainService.deleteByPrimaryKey(ids)>0){
resultJson = new ResultJson("200","删除成功");
}else {
resultJson = new ResultJson("500","insert faild");
}
return resultJson;
}
}
... ...
... ... @@ -14,7 +14,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
@RestController
@RequestMapping("/stall")
@RequestMapping("/inspection")
public class StaffSecurityInspectionController {
@Autowired
... ... @@ -24,8 +24,10 @@ public class StaffSecurityInspectionController {
public PageInfo<StaffSecurityInspection> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
int pageNum,
@RequestParam(value = "pageSize",required = false,defaultValue = "5")
int pageSize){
return staffSecurityInspectionService.findAll(pageNum,pageSize);
int pageSize,
@RequestParam(value = "securityInspectionName", required = false)
String securityInspectionName){
return staffSecurityInspectionService.findAll(pageNum,pageSize,securityInspectionName);
}
... ...
package com.tianbo.warehouse.dao;
import com.tianbo.warehouse.model.StaffApartmentMaintain;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface StaffApartmentMaintainMapper {
int deleteByPrimaryKey(String id);
int insert(StaffApartmentMaintain record);
int insertSelective(StaffApartmentMaintain record);
StaffApartmentMaintain selectByPrimaryKey(String id);
int updateByPrimaryKeySelective(StaffApartmentMaintain record);
int updateByPrimaryKey(StaffApartmentMaintain record);
List<StaffApartmentMaintain> findAll(@Param("repairsname") String repairsname);
}
\ No newline at end of file
... ...
package com.tianbo.warehouse.dao;
import com.tianbo.warehouse.model.StaffApartmentSpareKey;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface StaffApartmentSpareKeyMapper {
int deleteByPrimaryKey(String id);
int insert(StaffApartmentSpareKey record);
int insertSelective(StaffApartmentSpareKey record);
StaffApartmentSpareKey selectByPrimaryKey(String id);
int updateByPrimaryKeySelective(StaffApartmentSpareKey record);
int updateByPrimaryKey(StaffApartmentSpareKey record);
List<StaffApartmentSpareKey> findAll(@Param("staffname") String staffname);
}
\ No newline at end of file
... ...
package com.tianbo.warehouse.dao;
import com.tianbo.warehouse.model.StaffSecurityInspection;
import org.apache.ibatis.annotations.Param;
import java.util.List;
... ... @@ -17,5 +18,5 @@ public interface StaffSecurityInspectionMapper {
int updateByPrimaryKey(StaffSecurityInspection record);
List<StaffSecurityInspection> findAll();
List<StaffSecurityInspection>findAll(@Param("securityInspectionName") String securityInspectionName);
}
\ No newline at end of file
... ...
package com.tianbo.warehouse.imf;
import com.caac.imf.api.IMFClient;
import com.tianbo.warehouse.imf.handle.IMFSaveHandle;
import com.tianbo.warehouse.imf.schedul.IMF_Task;
import org.apache.log4j.Logger;
public class IMF_Reader extends Thread{
protected static final Logger logger = Logger.getLogger(IMF_Reader.class);
private IMFClient client;
public static boolean isrunning;
public IMF_Reader(IMFClient client) {
this.client = client;
}
@Override
public void run() {
try{
isrunning =true;
while(true) {
if (IMF_Task.LOGIN_OK) {
String message = this.client.getMSG();
if (message != null) {
IMFSaveHandle imfSaveHandle = new IMFSaveHandle();
imfSaveHandle.handle(message);
}
} else {
//logger.info("***");
}
try {
Thread.sleep(500L);
} catch (InterruptedException var3) {
var3.printStackTrace();
}
}
}catch (Exception e){
e.printStackTrace();
}
isrunning=false;
logger.info("****************读取线程不在了****************");
}
}
package com.tianbo.warehouse.imf;
import com.caac.imf.api.IMFClient;
import com.tianbo.warehouse.imf.schedul.IMF_Task;
import com.tianbo.warehouse.util.Date.DateUtil;
import com.tianbo.warehouse.util.IO.FileTool;
import com.tianbo.warehouse.util.XML.MakeImfMeta;
import org.apache.commons.io.FileUtils;
import org.apache.log4j.Logger;
import java.io.*;
import java.util.Iterator;
import java.util.List;
public class IMF_Sender extends Thread{
protected static final Logger logger = Logger.getLogger(IMF_Sender.class);
public static boolean isrunning;
private IMFClient client;
private String content;
public IMF_Sender(IMFClient client) {
this.client = client;
}
public IMF_Sender(IMFClient client, String content) {
this.client = client;
this.content = content;
}
@Override
public void run(){
String sendDir = FileTool.readProperties("readDirectory");
String SNDR = FileTool.readProperties("loginname");
String TYPE = FileTool.readProperties("TYPE");
String STYP = FileTool.readProperties("STYP");
String RCVR = FileTool.readProperties("RCVR");
String DDTM = DateUtil.getDDTM();
String SEQN = DDTM;
if (this.client == null) {
logger.info("IMFClient has been closed");
return;
}
isrunning=true;
if(IMF_Task.isSuc){
if(IMF_Task.LOGIN_OK){
while (true){
//发送报文
List<File> files = FileTool.readDirectoryFiles(new File(sendDir));
String sendMsg = "";
Iterator<File> it = files.iterator();
while(it.hasNext()){
File file = it.next();
try {
sendMsg = MakeImfMeta.makeImfDocument(SNDR,RCVR,TYPE,STYP,DDTM,SEQN,file);
String returnMsg = this.client.sendMSG(sendMsg);
if(returnMsg.indexOf("<CODE>9</CODE>")>=0){
FileUtils.forceDelete(file);
}
}catch (Exception e){
e.printStackTrace();
}
}
try {
Thread.sleep(500L);
} catch (InterruptedException var3) {
var3.printStackTrace();
}
}
}else{
logger.info("<<<<<<<<<<<登陆中>>>>>>>>>>>>");
}
}
isrunning=false;
logger.info("<<<<<<<<<<<发送线程结束>>>>>>>>>>>>");
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
}
package com.tianbo.warehouse.imf.handle;
import com.tianbo.warehouse.model.T_ETL_MESSAGE;
import com.tianbo.warehouse.service.T_ETL_MESSAGEService;
import com.tianbo.warehouse.util.Date.DateUtil;
import com.tianbo.warehouse.util.IO.FileTool;
import com.tianbo.warehouse.util.XML.XML2ENTITY;
import org.apache.log4j.Logger;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import java.util.Date;
import java.util.Map;
/**
* 存储IMF过来的原始报文到数据仓库T_ELT_MESSAGE原始报文表中
*/
@Component
public class IMFSaveHandle {
@Autowired
protected T_ETL_MESSAGEService messageService;
private static IMFSaveHandle saveHandle;
protected static final Logger logger = Logger.getLogger(IMFSaveHandle.class);
@PostConstruct
public void init(){
saveHandle = this;
saveHandle.messageService = this.messageService;
}
public void handle(String xmlmessage){
try {
//有人发报文头部不按规范发
// xmlmessage = xmlmessage.replace("<Msg>","<MSG>")
// .replace("<msg>","<MSG>")
// .replace("</Msg>","</MSG>")
// .replace("</msg>","</MSG>");
Document document = DocumentHelper.parseText(xmlmessage);
XML2ENTITY xml2ENTITY =new XML2ENTITY();
Map xmlMap = xml2ENTITY.Dom2Map(document);
Map meta = (Map) xmlMap.get("META");
T_ETL_MESSAGE message = new T_ETL_MESSAGE();
String sndrm = meta.get("SNDR").toString();
String stypm = meta.get("STYP").toString();
if ("TXD".equals(sndrm)){
//读取配置文件的需要本地存储报文的节点
String saveStyp= FileTool.readProperties("saveStyp");
String[] styps = saveStyp.split(",");
for (String item: styps) {
if (item.equals(stypm)){
//存储至备份目录
FileTool.writeFileToBak(xmlmessage);
}
}
}
String typem = meta.get("TYPE").toString();
String rcvr = XML2ENTITY.getMap(meta,"RCVR").toString();
String ddtm = meta.get("DDTM").toString();
String seqn = meta.get("SEQN").toString();
message.setSndr(sndrm);
message.setRcvr(rcvr);
message.setType(typem);
message.setStyp(stypm);
message.setSeqn(seqn);
Date ddtmDate = DateUtil.formatByyyyyMMddHHmmss(ddtm);
message.setDdtm(ddtmDate);
message.setSntm(ddtmDate);
message.setOper("ALL");
message.setAppid("W");
message.setEtltim(new Date());
message.setContent(xmlmessage);
int i = saveHandle.messageService.insertSelective(message);
}catch (Exception e){
FileTool.writeFile("err",e.toString()+"\n"+xmlmessage,false);
logger.warn("*报文入库失败已存储成备份文件*");
logger.error(e);
logger.warn(e);
}
}
}
package com.tianbo.warehouse.imf.schedul;
import com.caac.imf.api.IMFClient;
import com.caac.imf.api.IMFClientFactory;
import com.tianbo.warehouse.imf.IMF_Reader;
import com.tianbo.warehouse.imf.IMF_Sender;
import com.tianbo.warehouse.util.IO.FileTool;
import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
@Component
public class IMF_Task {
protected static final Logger logger = Logger.getLogger(IMF_Task.class);
private static final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
public static boolean LOGIN_OK = false;
public static boolean isSuc = true;
public static IMFClient client = null;
public static String loginname;
public static String loginpass;
public static String isNeedSend = "N";
// @Scheduled(fixedRate = 5000)
private static void start() throws Exception {
PropertyConfigurator.configure("config/log4j.properties");
client = IMFClientFactory.createInstance();
loginname= FileTool.readProperties("loginname");
loginpass= FileTool.readProperties("loginpass");
isNeedSend= FileTool.readProperties("isNeedSend");
//登录
if (!LOGIN_OK) {
loginIMF(client, loginname, loginpass, "config/imf_config.properties");
}
//启动读取线程
if (client != null) {
IMF_Reader reader = new IMF_Reader(client);
if (!IMF_Reader.isrunning) {
reader.start();
logger.info("*********读取线程已开启***********");
} else {
// logger.info("*********读取线程已开启-不再启动线程*********");
}
if("Y".equals(isNeedSend)){
IMF_Sender kako_sender = new IMF_Sender(client);
if(!IMF_Sender.isrunning) {
kako_sender.start();
}
}
}
}
public void sendMsg(String msg){
if (!msg.equals(null) && !msg.isEmpty()){
if(LOGIN_OK){
IMF_Sender sender = new IMF_Sender(client,msg);
sender.setContent(msg);
sender.start();
}
}
}
private static void loginIMF(IMFClient client, String userName, String password, String confFileName) {
if (client.initial(confFileName)) {
String message = client.login(userName, password);
logger.info("message=" + message);
if (message.indexOf("<CODE>1</CODE>") > 0) {
logger.info("登陆成功");
LOGIN_OK = true;
} else {
int times = 0;
while(times <= 3) {
logger.info("try connection...");
++times;
logger.info("message.=" + message);
if (message.indexOf("<CODE>1</CODE>") > 0) {
logger.info("登陆成功");
LOGIN_OK = true;
break;
}
logger.info("登录失败~~~~");
message = client.login(userName, password);
try {
Thread.sleep(4000L);
} catch (InterruptedException var7) {
var7.printStackTrace();
}
}
if (!LOGIN_OK) {
logger.info("多次尝试登录失败，退出登陆");
client.disconnect();
isSuc =false;
System.exit(-1);
}
}
}
}
}
package com.tianbo.warehouse.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
public class StaffApartmentMaintain {
private String id;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date repairsdate;
private String repairscontent;
private String reflectway;
private String repairsdept;
private String answerthephonename;
private String repairsname;
private String repairsphone;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date maintaindate;
private String maintaincase;
private String cooperatemaintainname;
private Integer meno;
private String remark1;
private String remark2;
private String remark3;
private Integer createby;
private Date createtime;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id == null ? null : id.trim();
}
public Date getRepairsdate() {
return repairsdate;
}
public void setRepairsdate(Date repairsdate) {
this.repairsdate = repairsdate;
}
public String getRepairscontent() {
return repairscontent;
}
public void setRepairscontent(String repairscontent) {
this.repairscontent = repairscontent == null ? null : repairscontent.trim();
}
public String getReflectway() {
return reflectway;
}
public void setReflectway(String reflectway) {
this.reflectway = reflectway == null ? null : reflectway.trim();
}
public String getRepairsdept() {
return repairsdept;
}
public void setRepairsdept(String repairsdept) {
this.repairsdept = repairsdept == null ? null : repairsdept.trim();
}
public String getAnswerthephonename() {
return answerthephonename;
}
public void setAnswerthephonename(String answerthephonename) {
this.answerthephonename = answerthephonename == null ? null : answerthephonename.trim();
}
public String getRepairsname() {
return repairsname;
}
public void setRepairsname(String repairsname) {
this.repairsname = repairsname == null ? null : repairsname.trim();
}
public String getRepairsphone() {
return repairsphone;
}
public void setRepairsphone(String repairsphone) {
this.repairsphone = repairsphone == null ? null : repairsphone.trim();
}
public Date getMaintaindate() {
return maintaindate;
}
public void setMaintaindate(Date maintaindate) {
this.maintaindate = maintaindate;
}
public String getMaintaincase() {
return maintaincase;
}
public void setMaintaincase(String maintaincase) {
this.maintaincase = maintaincase == null ? null : maintaincase.trim();
}
public String getCooperatemaintainname() {
return cooperatemaintainname;
}
public void setCooperatemaintainname(String cooperatemaintainname) {
this.cooperatemaintainname = cooperatemaintainname == null ? null : cooperatemaintainname.trim();
}
public Integer getMeno() {
return meno;
}
public void setMeno(Integer meno) {
this.meno = meno;
}
public String getRemark1() {
return remark1;
}
public void setRemark1(String remark1) {
this.remark1 = remark1 == null ? null : remark1.trim();
}
public String getRemark2() {
return remark2;
}
public void setRemark2(String remark2) {
this.remark2 = remark2 == null ? null : remark2.trim();
}
public String getRemark3() {
return remark3;
}
public void setRemark3(String remark3) {
this.remark3 = remark3 == null ? null : remark3.trim();
}
public Integer getCreateby() {
return createby;
}
public void setCreateby(Integer createby) {
this.createby = createby;
}
public Date getCreatetime() {
return createtime;
}
public void setCreatetime(Date createtime) {
this.createtime = createtime;
}
}
\ No newline at end of file
... ...
package com.tianbo.warehouse.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
public class StaffApartmentSpareKey {
private String id;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date usedate;
private String roomnum;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date usetime;
private String staffname;
private String dept;
private String phone;
private String ictype;
private String iccard;
private String roomduty;
private String remark1;
private String remark2;
private String remark3;
private Integer createby;
private Date createtime;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id == null ? null : id.trim();
}
public Date getUsedate() {
return usedate;
}
public void setUsedate(Date usedate) {
this.usedate = usedate;
}
public String getRoomnum() {
return roomnum;
}
public void setRoomnum(String roomnum) {
this.roomnum = roomnum == null ? null : roomnum.trim();
}
public Date getUsetime() {
return usetime;
}
public void setUsetime(Date usetime) {
this.usetime = usetime;
}
public String getStaffname() {
return staffname;
}
public void setStaffname(String staffname) {
this.staffname = staffname == null ? null : staffname.trim();
}
public String getDept() {
return dept;
}
public void setDept(String dept) {
this.dept = dept == null ? null : dept.trim();
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone == null ? null : phone.trim();
}
public String getIctype() {
return ictype;
}
public void setIctype(String ictype) {
this.ictype = ictype == null ? null : ictype.trim();
}
public String getIccard() {
return iccard;
}
public void setIccard(String iccard) {
this.iccard = iccard == null ? null : iccard.trim();
}
public String getRoomduty() {
return roomduty;
}
public void setRoomduty(String roomduty) {
this.roomduty = roomduty == null ? null : roomduty.trim();
}
public String getRemark1() {
return remark1;
}
public void setRemark1(String remark1) {
this.remark1 = remark1 == null ? null : remark1.trim();
}
public String getRemark2() {
return remark2;
}
public void setRemark2(String remark2) {
this.remark2 = remark2 == null ? null : remark2.trim();
}
public String getRemark3() {
return remark3;
}
public void setRemark3(String remark3) {
this.remark3 = remark3 == null ? null : remark3.trim();
}
public Integer getCreateby() {
return createby;
}
public void setCreateby(Integer createby) {
this.createby = createby;
}
public Date getCreatetime() {
return createtime;
}
public void setCreatetime(Date createtime) {
this.createtime = createtime;
}
}
\ No newline at end of file
... ...
package com.tianbo.warehouse.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
public class StaffSecurityInspection {
... ... @@ -7,6 +10,8 @@ public class StaffSecurityInspection {
private String securityInspectionName;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date securityInspectionDate;
private String fireName;
... ... @@ -21,6 +26,8 @@ public class StaffSecurityInspection {
private String builders;
private String otherSituations;
private Integer userId;
private String realname;
... ... @@ -47,6 +54,7 @@ public class StaffSecurityInspection {
return securityInspectionDate;
}
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
public void setSecurityInspectionDate(Date securityInspectionDate) {
this.securityInspectionDate = securityInspectionDate;
}
... ... @@ -99,6 +107,14 @@ public class StaffSecurityInspection {
this.builders = builders == null ? null : builders.trim();
}
public String getOtherSituations() {
return otherSituations;
}
public void setOtherSituations(String otherSituations) {
this.otherSituations = otherSituations == null ? null : otherSituations.trim();
}
public Integer getUserId() {
return userId;
}
... ...
... ... @@ -64,6 +64,8 @@ public class MyAuthenticationSuccessHandler extends SavedRequestAwareAuthenticat
USERS loginedUser = new USERS();
loginedUser.setUsername(user.getUsername());
loginedUser.setUserface(user.getUserface());
loginedUser.setUserId(user.getUserId());
loginedUser.setRealname(user.getRealname());
//设置用户的TOKEN的有效时间，时间配置在配置文件中设置
... ...
package com.tianbo.warehouse.service.satff.Imp;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.tianbo.warehouse.dao.StaffApartmentSpareKeyMapper;
import com.tianbo.warehouse.dao.StaffSecurityInspectionMapper;
import com.tianbo.warehouse.model.StaffApartmentSpareKey;
import com.tianbo.warehouse.model.StaffSecurityInspection;
import com.tianbo.warehouse.service.satff.KeyService;
import com.tianbo.warehouse.service.satff.StaffSecurityInspectionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@Service
public class KeyServiceImp implements KeyService {
@Autowired
StaffApartmentSpareKeyMapper staffApartmentSpareKeyMapper;
@Override
public PageInfo<StaffApartmentSpareKey> findAll(int pageNum, int pageSize, String staffname) {
Page<StaffApartmentSpareKey> page = PageHelper.startPage(pageNum,pageSize);
List<StaffApartmentSpareKey> list = staffApartmentSpareKeyMapper.findAll(staffname);
PageInfo<StaffApartmentSpareKey> result = new PageInfo<>(list);
return result;
}
@Override
public int insertSelective(StaffApartmentSpareKey staffApartmentSpareKey) {
staffApartmentSpareKey.setId(UUID.randomUUID().toString());
staffApartmentSpareKey.setCreatetime(new Date());
return staffApartmentSpareKeyMapper.insertSelective(staffApartmentSpareKey);
}
@Override
public int updateByPrimaryKeySelective(StaffApartmentSpareKey staffApartmentSpareKey) {
staffApartmentSpareKey.setCreatetime(new Date());
return staffApartmentSpareKeyMapper.updateByPrimaryKeySelective(staffApartmentSpareKey);
}
@Override
public int deleteByPrimaryKey(String securityInspectionId) {
if (securityInspectionId.contains(",")){
try {
String a = "";
String[] split = securityInspectionId.split(",");
for (int i=0; i<split.length; i++){
staffApartmentSpareKeyMapper.deleteByPrimaryKey(split[i]);
}
System.out.println();
return 1;
}catch (Exception e){
e.printStackTrace();
return 0;
}
}else {
return staffApartmentSpareKeyMapper.deleteByPrimaryKey(securityInspectionId);
}
}
}
... ...
package com.tianbo.warehouse.service.satff.Imp;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.tianbo.warehouse.dao.StaffApartmentMaintainMapper;
import com.tianbo.warehouse.dao.StaffApartmentSpareKeyMapper;
import com.tianbo.warehouse.model.StaffApartmentMaintain;
import com.tianbo.warehouse.model.StaffApartmentSpareKey;
import com.tianbo.warehouse.service.satff.KeyService;
import com.tianbo.warehouse.service.satff.MaintainService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@Service
public class MaintainServiceImp implements MaintainService {
@Autowired
StaffApartmentMaintainMapper staffApartmentMaintainMapper;
@Override
public PageInfo<StaffApartmentMaintain> findAll(int pageNum, int pageSize, String staffname) {
Page<StaffApartmentMaintain> page = PageHelper.startPage(pageNum,pageSize);
List<StaffApartmentMaintain> list = staffApartmentMaintainMapper.findAll(staffname);
PageInfo<StaffApartmentMaintain> result = new PageInfo<>(list);
return result;
}
@Override
public int insertSelective(StaffApartmentMaintain staffApartmentMaintain) {
staffApartmentMaintain.setId(UUID.randomUUID().toString());
staffApartmentMaintain.setCreatetime(new Date());
return staffApartmentMaintainMapper.insertSelective(staffApartmentMaintain);
}
@Override
public int updateByPrimaryKeySelective(StaffApartmentMaintain staffApartmentMaintain) {
staffApartmentMaintain.setCreatetime(new Date());
return staffApartmentMaintainMapper.updateByPrimaryKeySelective(staffApartmentMaintain);
}
@Override
public int deleteByPrimaryKey(String securityInspectionId) {
if (securityInspectionId.contains(",")){
try {
String a = "";
String[] split = securityInspectionId.split(",");
for (int i=0; i<split.length; i++){
staffApartmentMaintainMapper.deleteByPrimaryKey(split[i]);
}
System.out.println();
return 1;
}catch (Exception e){
e.printStackTrace();
return 0;
}
}else {
return staffApartmentMaintainMapper.deleteByPrimaryKey(securityInspectionId);
}
}
}
... ...
... ... @@ -25,10 +25,9 @@ public class StaffSecurityInspectionServiceImp implements StaffSecurityInspectio
StaffSecurityInspectionMapper staffSecurityInspectionMapper;
@Override
public PageInfo<StaffSecurityInspection> findAll(int pageNum, int pageSize) {
public PageInfo<StaffSecurityInspection> findAll(int pageNum, int pageSize, String securityInspectionName) {
Page<StaffSecurityInspection> page = PageHelper.startPage(pageNum,pageSize);
List<StaffSecurityInspection> list = staffSecurityInspectionMapper.findAll();
List<StaffSecurityInspection> list = staffSecurityInspectionMapper.findAll(securityInspectionName);
PageInfo<StaffSecurityInspection> result = new PageInfo<>(list);
return result;
}
... ... @@ -37,6 +36,7 @@ public class StaffSecurityInspectionServiceImp implements StaffSecurityInspectio
public int insertSelective(StaffSecurityInspection staffSecurityInspection) {
staffSecurityInspection.setSecurityInspectionId(UUID.randomUUID().toString());
staffSecurityInspection.setOptTime(new Date());
staffSecurityInspection.setRealname(staffSecurityInspection.getSecurityInspectionName());
return staffSecurityInspectionMapper.insertSelective(staffSecurityInspection);
}
... ...
package com.tianbo.warehouse.service.satff;
import com.github.pagehelper.PageInfo;
import com.tianbo.warehouse.model.StaffApartmentSpareKey;
public interface KeyService {
PageInfo<StaffApartmentSpareKey> findAll(int pageNum, int pageSize, String staffname);
int insertSelective(StaffApartmentSpareKey staffApartmentSpareKey);
int updateByPrimaryKeySelective(StaffApartmentSpareKey staffApartmentSpareKey);
int deleteByPrimaryKey(String id);
}
... ...
package com.tianbo.warehouse.service.satff;
import com.github.pagehelper.PageInfo;
import com.tianbo.warehouse.model.StaffApartmentMaintain;
import com.tianbo.warehouse.model.StaffApartmentSpareKey;
public interface MaintainService {
PageInfo<StaffApartmentMaintain> findAll(int pageNum, int pageSize, String staffname);
int insertSelective(StaffApartmentMaintain staffApartmentMaintain);
int updateByPrimaryKeySelective(StaffApartmentMaintain staffApartmentMaintain);
int deleteByPrimaryKey(String id);
}
... ...
... ... @@ -6,7 +6,7 @@ import com.tianbo.warehouse.model.StaffSecurityInspection;
public interface StaffSecurityInspectionService {
PageInfo<StaffSecurityInspection> findAll(int pageNum, int pageSize);
PageInfo<StaffSecurityInspection> findAll(int pageNum, int pageSize, String securityInspectionName);
int insertSelective(StaffSecurityInspection staffSecurityInspection);
... ...
... ... @@ -22,7 +22,7 @@
select
<include refid="Base_Column_List" />
from company
<if test="companyName != '' companyName != null">
<if test="companyName != '' and companyName != null">
where company_name = #{companyName,jdbcType=VARCHAR}
</if>
ORDER BY company_id
... ...
... ... @@ -7,6 +7,7 @@
<result column="role_sign" property="roleSign" jdbcType="VARCHAR" />
<result column="description" property="description" jdbcType="VARCHAR" />
<result column="department_id" property="departmentId" jdbcType="VARCHAR" />
<collection property="permissions" ofType="com.tianbo.warehouse.model.PERMISSION" javaType="java.util.ArrayList" select="com.tianbo.warehouse.dao.PERMISSIONMapper.getRolePermisson" column="role_id"></collection>
</resultMap>
<sql id="Base_Column_List" >
role_id, role_name, role_sign, description, department_id
... ...
... ... @@ -29,11 +29,13 @@
values (#{id,jdbcType=INTEGER}, #{roleId,jdbcType=INTEGER}, #{permissionId,jdbcType=INTEGER}
)
</insert>
<insert id="insertRolePerm" parameterType="RolePermission">
<insert id="insertRolePerm" parameterType="com.tianbo.warehouse.model.RolePermission">
insert into role_permission(role_id, permission_id)
values
<foreach collection="permissionIds" item="rolePem" index="index" separator=",">
(#{roleId,jdbcType=INTEGER},#{rolePem,jdbcType=INTEGER})
<if test="rolePem !=null">
(#{roleId,jdbcType=INTEGER},#{rolePem,jdbcType=INTEGER})
</if>
</foreach>
</insert>
<insert id="insertSelective" parameterType="com.tianbo.warehouse.model.RolePermission" >
... ...
<?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.tianbo.warehouse.dao.StaffApartmentMaintainMapper" >
<resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.StaffApartmentMaintain" >
<id column="id" property="id" jdbcType="VARCHAR" />
<result column="repairsDate" property="repairsdate" jdbcType="TIMESTAMP" />
<result column="repairsContent" property="repairscontent" jdbcType="VARCHAR" />
<result column="reflectWay" property="reflectway" jdbcType="VARCHAR" />
<result column="repairsDept" property="repairsdept" jdbcType="VARCHAR" />
<result column="answerThePhoneName" property="answerthephonename" jdbcType="VARCHAR" />
<result column="repairsName" property="repairsname" jdbcType="VARCHAR" />
<result column="repairsPhone" property="repairsphone" jdbcType="VARCHAR" />
<result column="maintainDate" property="maintaindate" jdbcType="TIMESTAMP" />
<result column="maintainCase" property="maintaincase" jdbcType="VARCHAR" />
<result column="cooperateMaintainName" property="cooperatemaintainname" jdbcType="VARCHAR" />
<result column="meno" property="meno" jdbcType="INTEGER" />
<result column="remark1" property="remark1" jdbcType="VARCHAR" />
<result column="remark2" property="remark2" jdbcType="VARCHAR" />
<result column="remark3" property="remark3" jdbcType="VARCHAR" />
<result column="createBy" property="createby" jdbcType="INTEGER" />
<result column="createTime" property="createtime" jdbcType="TIMESTAMP" />
</resultMap>
<sql id="Base_Column_List" >
id, repairsDate, repairsContent, reflectWay, repairsDept, answerThePhoneName, repairsName,
repairsPhone, maintainDate, maintainCase, cooperateMaintainName, meno, remark1, remark2,
remark3, createBy, createTime
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
select
<include refid="Base_Column_List" />
from staff_apertment_maintain
where id = #{id,jdbcType=VARCHAR}
</select>
<select id="findAll" resultMap="BaseResultMap" parameterType="java.lang.String" >
select
<include refid="Base_Column_List" />
from staff_apertment_maintain
<if test="repairsname != null and repairsname!=''" >
where repairsName = #{repairsname, jdbcType=VARCHAR}
</if>
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
delete from staff_apertment_maintain
where id = #{id,jdbcType=VARCHAR}
</delete>
<insert id="insert" parameterType="com.tianbo.warehouse.model.StaffApartmentMaintain" >
insert into staff_apertment_maintain (id, repairsDate, repairsContent,
reflectWay, repairsDept, answerThePhoneName,
repairsName, repairsPhone, maintainDate,
maintainCase, cooperateMaintainName, meno,
remark1, remark2, remark3,
createBy, createTime)
values (#{id,jdbcType=VARCHAR}, #{repairsdate,jdbcType=TIMESTAMP}, #{repairscontent,jdbcType=VARCHAR},
#{reflectway,jdbcType=VARCHAR}, #{repairsdept,jdbcType=VARCHAR}, #{answerthephonename,jdbcType=VARCHAR},
#{repairsname,jdbcType=VARCHAR}, #{repairsphone,jdbcType=VARCHAR}, #{maintaindate,jdbcType=TIMESTAMP},
#{maintaincase,jdbcType=VARCHAR}, #{cooperatemaintainname,jdbcType=VARCHAR}, #{meno,jdbcType=INTEGER},
#{remark1,jdbcType=VARCHAR}, #{remark2,jdbcType=VARCHAR}, #{remark3,jdbcType=VARCHAR},
#{createby,jdbcType=INTEGER}, #{createtime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.tianbo.warehouse.model.StaffApartmentMaintain" >
insert into staff_apertment_maintain
<trim prefix="(" suffix=")" suffixOverrides="," >
<if test="id != null" >
id,
</if>
<if test="repairsdate != null" >
repairsDate,
</if>
<if test="repairscontent != null" >
repairsContent,
</if>
<if test="reflectway != null" >
reflectWay,
</if>
<if test="repairsdept != null" >
repairsDept,
</if>
<if test="answerthephonename != null" >
answerThePhoneName,
</if>
<if test="repairsname != null" >
repairsName,
</if>
<if test="repairsphone != null" >
repairsPhone,
</if>
<if test="maintaindate != null" >
maintainDate,
</if>
<if test="maintaincase != null" >
maintainCase,
</if>
<if test="cooperatemaintainname != null" >
cooperateMaintainName,
</if>
<if test="meno != null" >
meno,
</if>
<if test="remark1 != null" >
remark1,
</if>
<if test="remark2 != null" >
remark2,
</if>
<if test="remark3 != null" >
remark3,
</if>
<if test="createby != null" >
createBy,
</if>
<if test="createtime != null" >
createTime,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides="," >
<if test="id != null" >
#{id,jdbcType=VARCHAR},
</if>
<if test="repairsdate != null" >
#{repairsdate,jdbcType=TIMESTAMP},
</if>
<if test="repairscontent != null" >
#{repairscontent,jdbcType=VARCHAR},
</if>
<if test="reflectway != null" >
#{reflectway,jdbcType=VARCHAR},
</if>
<if test="repairsdept != null" >
#{repairsdept,jdbcType=VARCHAR},
</if>
<if test="answerthephonename != null" >
#{answerthephonename,jdbcType=VARCHAR},
</if>
<if test="repairsname != null" >
#{repairsname,jdbcType=VARCHAR},
</if>
<if test="repairsphone != null" >
#{repairsphone,jdbcType=VARCHAR},
</if>
<if test="maintaindate != null" >
#{maintaindate,jdbcType=TIMESTAMP},
</if>
<if test="maintaincase != null" >
#{maintaincase,jdbcType=VARCHAR},
</if>
<if test="cooperatemaintainname != null" >
#{cooperatemaintainname,jdbcType=VARCHAR},
</if>
<if test="meno != null" >
#{meno,jdbcType=INTEGER},
</if>
<if test="remark1 != null" >
#{remark1,jdbcType=VARCHAR},
</if>
<if test="remark2 != null" >
#{remark2,jdbcType=VARCHAR},
</if>
<if test="remark3 != null" >
#{remark3,jdbcType=VARCHAR},
</if>
<if test="createby != null" >
#{createby,jdbcType=INTEGER},
</if>
<if test="createtime != null" >
#{createtime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.StaffApartmentMaintain" >
update staff_apertment_maintain
<set >
<if test="repairsdate != null" >
repairsDate = #{repairsdate,jdbcType=TIMESTAMP},
</if>
<if test="repairscontent != null" >
repairsContent = #{repairscontent,jdbcType=VARCHAR},
</if>
<if test="reflectway != null" >
reflectWay = #{reflectway,jdbcType=VARCHAR},
</if>
<if test="repairsdept != null" >
repairsDept = #{repairsdept,jdbcType=VARCHAR},
</if>
<if test="answerthephonename != null" >
answerThePhoneName = #{answerthephonename,jdbcType=VARCHAR},
</if>
<if test="repairsname != null" >
repairsName = #{repairsname,jdbcType=VARCHAR},
</if>
<if test="repairsphone != null" >
repairsPhone = #{repairsphone,jdbcType=VARCHAR},
</if>
<if test="maintaindate != null" >
maintainDate = #{maintaindate,jdbcType=TIMESTAMP},
</if>
<if test="maintaincase != null" >
maintainCase = #{maintaincase,jdbcType=VARCHAR},
</if>
<if test="cooperatemaintainname != null" >
cooperateMaintainName = #{cooperatemaintainname,jdbcType=VARCHAR},
</if>
<if test="meno != null" >
meno = #{meno,jdbcType=INTEGER},
</if>
<if test="remark1 != null" >
remark1 = #{remark1,jdbcType=VARCHAR},
</if>
<if test="remark2 != null" >
remark2 = #{remark2,jdbcType=VARCHAR},
</if>
<if test="remark3 != null" >
remark3 = #{remark3,jdbcType=VARCHAR},
</if>
<if test="createby != null" >
createBy = #{createby,jdbcType=INTEGER},
</if>
<if test="createtime != null" >
createTime = #{createtime,jdbcType=TIMESTAMP},
</if>
</set>
where id = #{id,jdbcType=VARCHAR}
</update>
<update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.StaffApartmentMaintain" >
update staff_apertment_maintain
set repairsDate = #{repairsdate,jdbcType=TIMESTAMP},
repairsContent = #{repairscontent,jdbcType=VARCHAR},
reflectWay = #{reflectway,jdbcType=VARCHAR},
repairsDept = #{repairsdept,jdbcType=VARCHAR},
answerThePhoneName = #{answerthephonename,jdbcType=VARCHAR},
repairsName = #{repairsname,jdbcType=VARCHAR},
repairsPhone = #{repairsphone,jdbcType=VARCHAR},
maintainDate = #{maintaindate,jdbcType=TIMESTAMP},
maintainCase = #{maintaincase,jdbcType=VARCHAR},
cooperateMaintainName = #{cooperatemaintainname,jdbcType=VARCHAR},
meno = #{meno,jdbcType=INTEGER},
remark1 = #{remark1,jdbcType=VARCHAR},
remark2 = #{remark2,jdbcType=VARCHAR},
remark3 = #{remark3,jdbcType=VARCHAR},
createBy = #{createby,jdbcType=INTEGER},
createTime = #{createtime,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=VARCHAR}
</update>
</mapper>
\ No newline at end of file
... ...
<?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.tianbo.warehouse.dao.StaffApartmentSpareKeyMapper" >
<resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.StaffApartmentSpareKey" >
<id column="id" property="id" jdbcType="VARCHAR" />
<result column="useDate" property="usedate" jdbcType="TIMESTAMP" />
<result column="roomNum" property="roomnum" jdbcType="VARCHAR" />
<result column="useTime" property="usetime" jdbcType="TIMESTAMP" />
<result column="staffName" property="staffname" jdbcType="VARCHAR" />
<result column="dept" property="dept" jdbcType="VARCHAR" />
<result column="phone" property="phone" jdbcType="VARCHAR" />
<result column="icType" property="ictype" jdbcType="VARCHAR" />
<result column="icCard" property="iccard" jdbcType="VARCHAR" />
<result column="roomDuty" property="roomduty" jdbcType="VARCHAR" />
<result column="remark1" property="remark1" jdbcType="VARCHAR" />
<result column="remark2" property="remark2" jdbcType="VARCHAR" />
<result column="remark3" property="remark3" jdbcType="VARCHAR" />
<result column="createBy" property="createby" jdbcType="INTEGER" />
<result column="createTime" property="createtime" jdbcType="TIMESTAMP" />
</resultMap>
<sql id="Base_Column_List" >
id, useDate, roomNum, useTime, staffName, dept, phone, icType, icCard, roomDuty,
remark1, remark2, remark3, createBy, createTime
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
select
<include refid="Base_Column_List" />
from staff_apartment_spare_key
where id = #{id,jdbcType=VARCHAR}
</select>
<select id="findAll" resultMap="BaseResultMap" parameterType="java.lang.String" >
select
<include refid="Base_Column_List" />
from staff_apartment_spare_key
<if test="staffname != null and staffname!=''" >
where staffname = #{staffname, jdbcType=VARCHAR}
</if>
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
delete from staff_apartment_spare_key
where id = #{id,jdbcType=VARCHAR}
</delete>
<insert id="insert" parameterType="com.tianbo.warehouse.model.StaffApartmentSpareKey" >
insert into staff_apartment_spare_key (id, useDate, roomNum,
useTime, staffName, dept,
phone, icType, icCard,
roomDuty, remark1, remark2,
remark3, createBy, createTime
)
values (#{id,jdbcType=VARCHAR}, #{usedate,jdbcType=TIMESTAMP}, #{roomnum,jdbcType=VARCHAR},
#{usetime,jdbcType=TIMESTAMP}, #{staffname,jdbcType=VARCHAR}, #{dept,jdbcType=VARCHAR},
#{phone,jdbcType=VARCHAR}, #{ictype,jdbcType=VARCHAR}, #{iccard,jdbcType=VARCHAR},
#{roomduty,jdbcType=VARCHAR}, #{remark1,jdbcType=VARCHAR}, #{remark2,jdbcType=VARCHAR},
#{remark3,jdbcType=VARCHAR}, #{createby,jdbcType=INTEGER}, #{createtime,jdbcType=TIMESTAMP}
)
</insert>
<insert id="insertSelective" parameterType="com.tianbo.warehouse.model.StaffApartmentSpareKey" >
insert into staff_apartment_spare_key
<trim prefix="(" suffix=")" suffixOverrides="," >
<if test="id != null" >
id,
</if>
<if test="usedate != null" >
useDate,
</if>
<if test="roomnum != null" >
roomNum,
</if>
<if test="usetime != null" >
useTime,
</if>
<if test="staffname != null" >
staffName,
</if>
<if test="dept != null" >
dept,
</if>
<if test="phone != null" >
phone,
</if>
<if test="ictype != null" >
icType,
</if>
<if test="iccard != null" >
icCard,
</if>
<if test="roomduty != null" >
roomDuty,
</if>
<if test="remark1 != null" >
remark1,
</if>
<if test="remark2 != null" >
remark2,
</if>
<if test="remark3 != null" >
remark3,
</if>
<if test="createby != null" >
createBy,
</if>
<if test="createtime != null" >
createTime,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides="," >
<if test="id != null" >
#{id,jdbcType=VARCHAR},
</if>
<if test="usedate != null" >
#{usedate,jdbcType=TIMESTAMP},
</if>
<if test="roomnum != null" >
#{roomnum,jdbcType=VARCHAR},
</if>
<if test="usetime != null" >
#{usetime,jdbcType=TIMESTAMP},
</if>
<if test="staffname != null" >
#{staffname,jdbcType=VARCHAR},
</if>
<if test="dept != null" >
#{dept,jdbcType=VARCHAR},
</if>
<if test="phone != null" >
#{phone,jdbcType=VARCHAR},
</if>
<if test="ictype != null" >
#{ictype,jdbcType=VARCHAR},
</if>
<if test="iccard != null" >
#{iccard,jdbcType=VARCHAR},
</if>
<if test="roomduty != null" >
#{roomduty,jdbcType=VARCHAR},
</if>
<if test="remark1 != null" >
#{remark1,jdbcType=VARCHAR},
</if>
<if test="remark2 != null" >
#{remark2,jdbcType=VARCHAR},
</if>
<if test="remark3 != null" >
#{remark3,jdbcType=VARCHAR},
</if>
<if test="createby != null" >
#{createby,jdbcType=INTEGER},
</if>
<if test="createtime != null" >
#{createtime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.StaffApartmentSpareKey" >
update staff_apartment_spare_key
<set >
<if test="usedate != null" >
useDate = #{usedate,jdbcType=TIMESTAMP},
</if>
<if test="roomnum != null" >
roomNum = #{roomnum,jdbcType=VARCHAR},
</if>
<if test="usetime != null" >
useTime = #{usetime,jdbcType=TIMESTAMP},
</if>
<if test="staffname != null" >
staffName = #{staffname,jdbcType=VARCHAR},
</if>
<if test="dept != null" >
dept = #{dept,jdbcType=VARCHAR},
</if>
<if test="phone != null" >
phone = #{phone,jdbcType=VARCHAR},
</if>
<if test="ictype != null" >
icType = #{ictype,jdbcType=VARCHAR},
</if>
<if test="iccard != null" >
icCard = #{iccard,jdbcType=VARCHAR},
</if>
<if test="roomduty != null" >
roomDuty = #{roomduty,jdbcType=VARCHAR},
</if>
<if test="remark1 != null" >
remark1 = #{remark1,jdbcType=VARCHAR},
</if>
<if test="remark2 != null" >
remark2 = #{remark2,jdbcType=VARCHAR},
</if>
<if test="remark3 != null" >
remark3 = #{remark3,jdbcType=VARCHAR},
</if>
<if test="createby != null" >
createBy = #{createby,jdbcType=INTEGER},
</if>
<if test="createtime != null" >
createTime = #{createtime,jdbcType=TIMESTAMP},
</if>
</set>
where id = #{id,jdbcType=VARCHAR}
</update>
<update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.StaffApartmentSpareKey" >
update staff_apartment_spare_key
set useDate = #{usedate,jdbcType=TIMESTAMP},
roomNum = #{roomnum,jdbcType=VARCHAR},
useTime = #{usetime,jdbcType=TIMESTAMP},
staffName = #{staffname,jdbcType=VARCHAR},
dept = #{dept,jdbcType=VARCHAR},
phone = #{phone,jdbcType=VARCHAR},
icType = #{ictype,jdbcType=VARCHAR},
icCard = #{iccard,jdbcType=VARCHAR},
roomDuty = #{roomduty,jdbcType=VARCHAR},
remark1 = #{remark1,jdbcType=VARCHAR},
remark2 = #{remark2,jdbcType=VARCHAR},
remark3 = #{remark3,jdbcType=VARCHAR},
createBy = #{createby,jdbcType=INTEGER},
createTime = #{createtime,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=VARCHAR}
</update>
</mapper>
\ No newline at end of file
... ...
... ... @@ -11,14 +11,15 @@
<result column="doubtful_person" property="doubtfulPerson" jdbcType="VARCHAR" />
<result column="violations_car" property="violationsCar" jdbcType="VARCHAR" />
<result column="builders" property="builders" jdbcType="VARCHAR" />
<result column="other_situations" property="otherSituations" jdbcType="VARCHAR" />
<result column="user_id" property="userId" jdbcType="INTEGER" />
<result column="realname" property="realname" jdbcType="VARCHAR" />
<result column="opt_time" property="optTime" jdbcType="TIMESTAMP" />
</resultMap>
<sql id="Base_Column_List" >
security_inspection_id, security_inspection_name, security_inspection_date, fire_name,
security_electro, fireproofing, doubtful_person, violations_car, builders, user_id,
realname, opt_time
security_electro, fireproofing, doubtful_person, violations_car, builders, other_situations,
user_id, realname, opt_time
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
select
... ... @@ -31,7 +32,9 @@
select
<include refid="Base_Column_List" />
from staff_security_inspection
ORDER BY opt_time
<if test="securityInspectionName != null and securityInspectionName!=''" >
where security_inspection_name = #{securityInspectionName, jdbcType=VARCHAR}
</if>
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
... ... @@ -42,13 +45,13 @@
insert into staff_security_inspection (security_inspection_id, security_inspection_name,
security_inspection_date, fire_name, security_electro,
fireproofing, doubtful_person, violations_car,
builders, user_id, realname,
opt_time)
builders, other_situations, user_id,
realname, opt_time)
values (#{securityInspectionId,jdbcType=VARCHAR}, #{securityInspectionName,jdbcType=VARCHAR},
#{securityInspectionDate,jdbcType=TIMESTAMP}, #{fireName,jdbcType=VARCHAR}, #{securityElectro,jdbcType=VARCHAR},
#{fireproofing,jdbcType=VARCHAR}, #{doubtfulPerson,jdbcType=VARCHAR}, #{violationsCar,jdbcType=VARCHAR},
#{builders,jdbcType=VARCHAR}, #{userId,jdbcType=INTEGER}, #{realname,jdbcType=VARCHAR},
#{optTime,jdbcType=TIMESTAMP})
#{builders,jdbcType=VARCHAR}, #{otherSituations,jdbcType=VARCHAR}, #{userId,jdbcType=INTEGER},
#{realname,jdbcType=VARCHAR}, #{optTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.tianbo.warehouse.model.StaffSecurityInspection" >
insert into staff_security_inspection
... ... @@ -80,6 +83,9 @@
<if test="builders != null" >
builders,
</if>
<if test="otherSituations != null" >
other_situations,
</if>
<if test="userId != null" >
user_id,
</if>
... ... @@ -118,6 +124,9 @@
<if test="builders != null" >
#{builders,jdbcType=VARCHAR},
</if>
<if test="otherSituations != null" >
#{otherSituations,jdbcType=VARCHAR},
</if>
<if test="userId != null" >
#{userId,jdbcType=INTEGER},
</if>
... ... @@ -156,6 +165,9 @@
<if test="builders != null" >
builders = #{builders,jdbcType=VARCHAR},
</if>
<if test="otherSituations != null" >
other_situations = #{otherSituations,jdbcType=VARCHAR},
</if>
<if test="userId != null" >
user_id = #{userId,jdbcType=INTEGER},
</if>
... ... @@ -178,6 +190,7 @@
doubtful_person = #{doubtfulPerson,jdbcType=VARCHAR},
violations_car = #{violationsCar,jdbcType=VARCHAR},
builders = #{builders,jdbcType=VARCHAR},
other_situations = #{otherSituations,jdbcType=VARCHAR},
user_id = #{userId,jdbcType=INTEGER},
realname = #{realname,jdbcType=VARCHAR},
opt_time = #{optTime,jdbcType=TIMESTAMP}
... ...
package com.tianbo.warehouse;
import com.tianbo.warehouse.imf.handle.IMFSaveHandle;
public class handleTest {
private static String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><Msg> <META> <SNDR>NDLR</SNDR> <RCVR></RCVR> <SEQN>172-33519102</SEQN> <DDTM>20181229124530224</DDTM> <TYPE>HYXX</TYPE> <STYP>NDLR</STYP> </META> <DECLAREPREPAREMASTERXMLBODY> <Head> <MessageID>CN_MT2201_1P0_460470678920X_20181229124530224</MessageID> <FunctionCode>9</FunctionCode> <MessageType>MT2201MASTER</MessageType> <SenderID>460470678920X_DXPENT0000460002_20181229124530224</SenderID> <ReceiverID>4604_20181229124530224</ReceiverID> <SendTime>20181229124530224</SendTime> <Version>1.0</Version> </Head> <Declaration> <Carrier> <ID>CV</ID> </Carrier> <ORG> <ID>CGO</ID> </ORG> <DES> <ID>CDG</ID> </DES> <BorderTransportMeans> <JourneyID>9732/2019-01-01</JourneyID> </BorderTransportMeans> <Consignment> <TransportContractDocument> <ID>172-33519102</ID> </TransportContractDocument> <LoadingLocation> <ID>CGO/4604</ID> <LoadingDate>2018-12-29 12:45</LoadingDate> </LoadingLocation> <UnloadingLocation> <ID>CGO/4604</ID> </UnloadingLocation> <TransportSplitIndicator>0</TransportSplitIndicator> <ConsignmentPackaging> <QuantityQuantity>337</QuantityQuantity> </ConsignmentPackaging> <TotalGrossMassMeasure>3192</TotalGrossMassMeasure> <PreQuantityQuantity>337</PreQuantityQuantity> <PreTotalGrossMassMeasure>3192</PreTotalGrossMassMeasure> <CustomsStatus>001</CustomsStatus> <FreightPayment> <MethodCode>PP</MethodCode> </FreightPayment> <ProductName>IMITATION JEWELRY</ProductName> <PrepareTime>2018-12-29 12:45</PrepareTime> <CustomsCode>4604</CustomsCode> <AgentName>ZRP</AgentName> <AgentCompany>郑州睿鹏物流有限公司</AgentCompany> <NameOfgoods>IMITATION JEWELRY</NameOfgoods> <DeliveryStation>001</DeliveryStation> <UNnumber></UNnumber> <Category></Category> <Consignee> <Name>QUALITAIR SEA INTERNATIONAL</Name> <Address> <Line>4 RUE DU MEUNIER BP 19622 95724 ROISSY CDG</Line> <CityName>CDG</CityName> <CountryCode>FR</CountryCode> <ZipCode></ZipCode> <PROVINCECODE></PROVINCECODE> <PROVINCENAME></PROVINCENAME> <Deltaname></Deltaname> <TelePhone>33 1 34 38 58 13</TelePhone> <Fax></Fax> <CNECUSID>EUROPEAN VAT NUMBER+FR93392293635</CNECUSID> <CNEAEO></CNEAEO> <Unlodingcode>CDG</Unlodingcode> </Address> </Consignee> <Consignor> <name>ON TIME EXPRESS LIMITED</name> <Address> <Line>ROOM 1102 FINANCIAL STREET HAI LUN CENTER NO 440 HAI LUN ROAD</Line> <CountryCode>CN</CountryCode> <ZipCode></ZipCode> <Deltaname></Deltaname> <TelePhone>862163642582</TelePhone> <Fax></Fax> <SHPAEO></SHPAEO> <SHPCUSID>USCI+91310000717852489D</SHPCUSID> </Address> </Consignor> </Consignment> </Declaration> </DECLAREPREPAREMASTERXMLBODY></Msg>";
public static void main(String[] args) {
IMFSaveHandle handle = new IMFSaveHandle();
handle.init();
handle.handle(xml);
}
}