From e8e96b3e41b09b7021b748d2c02c73f210b427ef Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期日, 19 九月 2021 12:52:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/ints/entity/ErpreqLog.java | 186 ++++++++++++
src/main/java/com/zy/ints/mapper/ErpreqLogMapper.java | 12
src/main/java/com/zy/ints/service/ErpreqLogService.java | 8
src/main/resources/mapper/ErpreqLogMapper.xml | 17 +
src/main/java/com/zy/asrs/task/PltBarcodeLogScheduler.java | 6
src/main/webapp/views/erpreqLog/erpreqLog.html | 135 +++++++++
src/main/java/com/zy/common/CodeBuilder.java | 4
src/main/java/com/zy/ints/service/impl/ErpreqLogServiceImpl.java | 12
src/main/java/erpreqLog.sql | 20 +
src/main/webapp/static/js/erpreqLog/erpreqLog.js | 249 ++++++++++++++++
src/main/java/com/zy/ints/controller/ErpreqLogController.java | 123 ++++++++
src/main/java/com/zy/ints/task/handler/ErpreqLogHandler.java | 35 ++
src/main/webapp/static/js/handWrkMast/handWrkMast.js | 6
src/main/java/com/zy/asrs/task/handler/PltBarcodeLogHandler.java | 2
src/main/java/com/zy/ints/task/ErpreqLogScheduler.java | 37 ++
15 files changed, 842 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/PltBarcodeLogScheduler.java b/src/main/java/com/zy/asrs/task/PltBarcodeLogScheduler.java
index 28c206a..70a6597 100644
--- a/src/main/java/com/zy/asrs/task/PltBarcodeLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/PltBarcodeLogScheduler.java
@@ -1,7 +1,7 @@
package com.zy.asrs.task;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.handler.PltBarcodeLogHandle;
+import com.zy.asrs.task.handler.PltBarcodeLogHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,11 +17,11 @@
private static final Logger log = LoggerFactory.getLogger(PltBarcodeLogScheduler.class);
@Autowired
- private PltBarcodeLogHandle pltBarcodeLogHandle;
+ private PltBarcodeLogHandler pltBarcodeLogHandler;
@Scheduled(cron = "0/30 * * * * ? ")
private void execute(){
- ReturnT<String> returnT = pltBarcodeLogHandle.start();
+ ReturnT<String> returnT = pltBarcodeLogHandler.start();
if (!returnT.isSuccess()) {
log.error(returnT.getMsg());
}
diff --git a/src/main/java/com/zy/asrs/task/handler/PltBarcodeLogHandle.java b/src/main/java/com/zy/asrs/task/handler/PltBarcodeLogHandler.java
similarity index 94%
rename from src/main/java/com/zy/asrs/task/handler/PltBarcodeLogHandle.java
rename to src/main/java/com/zy/asrs/task/handler/PltBarcodeLogHandler.java
index 718cce6..140bb96 100644
--- a/src/main/java/com/zy/asrs/task/handler/PltBarcodeLogHandle.java
+++ b/src/main/java/com/zy/asrs/task/handler/PltBarcodeLogHandler.java
@@ -12,7 +12,7 @@
* Created by TQS on 2021/9/10
*/
@Service
-public class PltBarcodeLogHandle extends AbstractHandler<String> {
+public class PltBarcodeLogHandler extends AbstractHandler<String> {
@Autowired
private JdbcTemplate jdbcTemplate;
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 7fe1f35..7833c0a 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -18,8 +18,8 @@
generator.url="192.168.4.208:1433;databasename=xgmasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="asr_plt_barcode";
- generator.packagePath="com.zy.asrs";
+ generator.table="ints_erpreq_log";
+ generator.packagePath="com.zy.ints";
// generator.html=false;
// generator.js=false;
// generator.htmlDetail=false;
diff --git a/src/main/java/com/zy/ints/controller/ErpreqLogController.java b/src/main/java/com/zy/ints/controller/ErpreqLogController.java
new file mode 100644
index 0000000..becd22e
--- /dev/null
+++ b/src/main/java/com/zy/ints/controller/ErpreqLogController.java
@@ -0,0 +1,123 @@
+package com.zy.ints.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.ints.entity.ErpreqLog;
+import com.zy.ints.service.ErpreqLogService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class ErpreqLogController extends BaseController {
+
+ @Autowired
+ private ErpreqLogService erpreqLogService;
+
+ @RequestMapping(value = "/erpreqLog/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(erpreqLogService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/erpreqLog/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<ErpreqLog> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(erpreqLogService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/erpreqLog/add/auth")
+ @ManagerAuth
+ public R add(ErpreqLog erpreqLog) {
+ erpreqLogService.insert(erpreqLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/erpreqLog/update/auth")
+ @ManagerAuth
+ public R update(ErpreqLog erpreqLog){
+ if (Cools.isEmpty(erpreqLog) || null==erpreqLog.getId()){
+ return R.error();
+ }
+ erpreqLogService.updateById(erpreqLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/erpreqLog/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ erpreqLogService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/erpreqLog/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<ErpreqLog> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("erpreqLog"));
+ convert(map, wrapper);
+ List<ErpreqLog> list = erpreqLogService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/erpreqLogQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<ErpreqLog> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<ErpreqLog> page = erpreqLogService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (ErpreqLog erpreqLog : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", erpreqLog.getId());
+ map.put("value", erpreqLog.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/erpreqLog/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<ErpreqLog> wrapper = new EntityWrapper<ErpreqLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != erpreqLogService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(ErpreqLog.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/ints/entity/ErpreqLog.java b/src/main/java/com/zy/ints/entity/ErpreqLog.java
new file mode 100644
index 0000000..823982f
--- /dev/null
+++ b/src/main/java/com/zy/ints/entity/ErpreqLog.java
@@ -0,0 +1,186 @@
+package com.zy.ints.entity;
+
+import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotations.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@TableName("ints_erpreq_log")
+public class ErpreqLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 鏃ュ織绫诲瀷 1: 鍏ュ簱 2: 鍏ュ簱鏇存柊 3: 鍑哄簱 4: 鍑哄簱鏇存柊 5: 鐩樼偣 6: 鐩樼偣鏇存柊 7: 搴撳瓨鍚屾
+ */
+ @ApiModelProperty(value= "鏃ュ織绫诲瀷 1: 鍏ュ簱 2: 鍏ュ簱鏇存柊 3: 鍑哄簱 4: 鍑哄簱鏇存柊 5: 鐩樼偣 6: 鐩樼偣鏇存柊 7: 搴撳瓨鍚屾 ")
+ @TableField("log_type")
+ private Integer logType;
+
+ /**
+ * 璇锋眰閾炬帴
+ */
+ @ApiModelProperty(value= "璇锋眰閾炬帴")
+ @TableField("req_url")
+ private String reqUrl;
+
+ @ApiModelProperty(value= "")
+ @TableField("req_params")
+ private String reqParams;
+
+ @ApiModelProperty(value= "")
+ @TableField("res_params")
+ private String resParams;
+
+ /**
+ * 缁撴灉 0: 鎴愬姛 1: 澶辫触
+ */
+ @ApiModelProperty(value= "缁撴灉 0: 鎴愬姛 1: 澶辫触 ")
+ private Short result;
+
+ /**
+ * 寤烘。鏃堕棿
+ */
+ @ApiModelProperty(value= "寤烘。鏃堕棿")
+ @TableField("appe_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date appeTime;
+
+ public ErpreqLog() {}
+
+ public ErpreqLog(Integer logType,String reqUrl,String reqParams,String resParams,Short result,Date appeTime) {
+ this.logType = logType;
+ this.reqUrl = reqUrl;
+ this.reqParams = reqParams;
+ this.resParams = resParams;
+ this.result = result;
+ this.appeTime = appeTime;
+ }
+
+// ErpreqLog erpreqLog = new ErpreqLog(
+// null, // 鏃ュ織绫诲瀷
+// null, // 璇锋眰閾炬帴
+// null, //
+// null, //
+// null, // 缁撴灉
+// null // 寤烘。鏃堕棿
+// );
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Integer getLogType() {
+ return logType;
+ }
+
+ public String getLogType$(){
+ if (null == this.logType){ return null; }
+ switch (this.logType){
+ case 1:
+ return "鍏ュ簱";
+ case 2:
+ return "鍏ュ簱鏇存柊";
+ case 3:
+ return "鍑哄簱";
+ case 4:
+ return "鍑哄簱鏇存柊";
+ case 5:
+ return "鐩樼偣";
+ case 6:
+ return "鐩樼偣鏇存柊";
+ case 7:
+ return "搴撳瓨鍚屾";
+ default:
+ return String.valueOf(this.logType);
+ }
+ }
+
+ public void setLogType(Integer logType) {
+ this.logType = logType;
+ }
+
+ public String getReqUrl() {
+ return reqUrl;
+ }
+
+ public void setReqUrl(String reqUrl) {
+ this.reqUrl = reqUrl;
+ }
+
+ public String getReqParams() {
+ return reqParams;
+ }
+
+ public void setReqParams(String reqParams) {
+ this.reqParams = reqParams;
+ }
+
+ public String getResParams() {
+ return resParams;
+ }
+
+ public void setResParams(String resParams) {
+ this.resParams = resParams;
+ }
+
+ public Short getResult() {
+ return result;
+ }
+
+ public String getResult$(){
+ if (null == this.result){ return null; }
+ switch (this.result){
+ case 0:
+ return "鎴愬姛";
+ case 1:
+ return "澶辫触";
+ default:
+ return String.valueOf(this.result);
+ }
+ }
+
+ public void setResult(Short result) {
+ this.result = result;
+ }
+
+ public Date getAppeTime() {
+ return appeTime;
+ }
+
+ public String getAppeTime$(){
+ if (Cools.isEmpty(this.appeTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
+ }
+
+ public void setAppeTime(Date appeTime) {
+ this.appeTime = appeTime;
+ }
+
+
+}
diff --git a/src/main/java/com/zy/ints/mapper/ErpreqLogMapper.java b/src/main/java/com/zy/ints/mapper/ErpreqLogMapper.java
new file mode 100644
index 0000000..3ace90c
--- /dev/null
+++ b/src/main/java/com/zy/ints/mapper/ErpreqLogMapper.java
@@ -0,0 +1,12 @@
+package com.zy.ints.mapper;
+
+import com.zy.ints.entity.ErpreqLog;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ErpreqLogMapper extends BaseMapper<ErpreqLog> {
+
+}
diff --git a/src/main/java/com/zy/ints/service/ErpreqLogService.java b/src/main/java/com/zy/ints/service/ErpreqLogService.java
new file mode 100644
index 0000000..cecb901
--- /dev/null
+++ b/src/main/java/com/zy/ints/service/ErpreqLogService.java
@@ -0,0 +1,8 @@
+package com.zy.ints.service;
+
+import com.zy.ints.entity.ErpreqLog;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface ErpreqLogService extends IService<ErpreqLog> {
+
+}
diff --git a/src/main/java/com/zy/ints/service/impl/ErpreqLogServiceImpl.java b/src/main/java/com/zy/ints/service/impl/ErpreqLogServiceImpl.java
new file mode 100644
index 0000000..03b5acc
--- /dev/null
+++ b/src/main/java/com/zy/ints/service/impl/ErpreqLogServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.ints.service.impl;
+
+import com.zy.ints.mapper.ErpreqLogMapper;
+import com.zy.ints.entity.ErpreqLog;
+import com.zy.ints.service.ErpreqLogService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("erpreqLogService")
+public class ErpreqLogServiceImpl extends ServiceImpl<ErpreqLogMapper, ErpreqLog> implements ErpreqLogService {
+
+}
diff --git a/src/main/java/com/zy/ints/task/ErpreqLogScheduler.java b/src/main/java/com/zy/ints/task/ErpreqLogScheduler.java
new file mode 100644
index 0000000..41697ba
--- /dev/null
+++ b/src/main/java/com/zy/ints/task/ErpreqLogScheduler.java
@@ -0,0 +1,37 @@
+package com.zy.ints.task;
+
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.ints.task.handler.ErpreqLogHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * ERP璇锋眰鏃ュ織鍒犻櫎
+ * Created by vincent on 2021/9/19
+ */
+@Component
+public class ErpreqLogScheduler {
+ private static final Logger log = LoggerFactory.getLogger(ErpreqLogScheduler.class);
+
+ @Autowired
+ private ErpreqLogHandler erpreqLogHandler;
+
+ /**
+ * ERP鎺ュ彛鏄惁鍚敤
+ */
+ @Value("${erp.enabled}")
+ private Boolean erpEnabled;
+
+ @Scheduled(cron = "0/10 * * * * ? ")
+ private void execute(){
+ if(!erpEnabled) return;
+ ReturnT<String> returnT = erpreqLogHandler.start();
+ if (!returnT.isSuccess()) {
+ log.error(returnT.getMsg());
+ }
+ }
+}
diff --git a/src/main/java/com/zy/ints/task/handler/ErpreqLogHandler.java b/src/main/java/com/zy/ints/task/handler/ErpreqLogHandler.java
new file mode 100644
index 0000000..87769f3
--- /dev/null
+++ b/src/main/java/com/zy/ints/task/handler/ErpreqLogHandler.java
@@ -0,0 +1,35 @@
+package com.zy.ints.task.handler;
+
+import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.core.ReturnT;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+/**
+ * ERP璇锋眰鏃ュ織鍒犻櫎
+ * Created by vincent on 2021/9/19
+ */
+@Service
+public class ErpreqLogHandler extends AbstractHandler<String> {
+ @Autowired
+ private JdbcTemplate jdbcTemplate;
+
+ @Transactional
+ public ReturnT<String> start() {
+ try {
+ // 鍒犻櫎鏃ユ湡瓒呰繃10澶╃殑璇锋眰鏃ュ織璁板綍
+ int deleteCount = jdbcTemplate.update("delete from ints_erpreq_log where dateadd(day,10,appe_time) <= getdate();");
+ if (deleteCount <= 0) {
+ exceptionHandle("鍒犻櫎ERP璇锋眰鏃ュ織瓒呰繃10澶╄褰曢敊璇� ! ");
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ return SUCCESS;
+ }
+}
diff --git a/src/main/java/erpreqLog.sql b/src/main/java/erpreqLog.sql
new file mode 100644
index 0000000..3bbd474
--- /dev/null
+++ b/src/main/java/erpreqLog.sql
@@ -0,0 +1,20 @@
+-- save erpreqLog record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'erpreqLog/erpreqLog.html', 'erpreqLog绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'erpreqLog#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'erpreqLog#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'erpreqLog#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'erpreqLog#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'erpreqLog#btn-export', '瀵煎嚭', '', '3', '4', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'erpreqLog#btn-into', '瀵煎叆', '', '3', '5', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'erpreqLog/erpreqLog.html', N'erpreqLog绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'erpreqLog#view', N'鏌ヨ', '20383', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'erpreqLog#btn-add', N'鏂板', '20383', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'erpreqLog#btn-edit', N'缂栬緫', '20383', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'erpreqLog#btn-delete', N'鍒犻櫎', '20383', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'erpreqLog#btn-export', N'瀵煎嚭', '20383', '3', '4', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'erpreqLog#btn-into', N'瀵煎叆', '20383', '3', '5', '1');
diff --git a/src/main/resources/mapper/ErpreqLogMapper.xml b/src/main/resources/mapper/ErpreqLogMapper.xml
new file mode 100644
index 0000000..12068ba
--- /dev/null
+++ b/src/main/resources/mapper/ErpreqLogMapper.xml
@@ -0,0 +1,17 @@
+<?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.zy.ints.mapper.ErpreqLogMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.ints.entity.ErpreqLog">
+ <id column="id" property="id" />
+ <result column="log_type" property="logType" />
+ <result column="req_url" property="reqUrl" />
+ <result column="req_params" property="reqParams" />
+ <result column="res_params" property="resParams" />
+ <result column="result" property="result" />
+ <result column="appe_time" property="appeTime" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/erpreqLog/erpreqLog.js b/src/main/webapp/static/js/erpreqLog/erpreqLog.js
new file mode 100644
index 0000000..a9a2c57
--- /dev/null
+++ b/src/main/webapp/static/js/erpreqLog/erpreqLog.js
@@ -0,0 +1,249 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#erpreqLog',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/erpreqLog/list/auth',
+ page: true,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: 'ID',width:100}
+ ,{field: 'logType$', align: 'center',title: '鏃ュ織绫诲瀷',width:100}
+ ,{field: 'reqUrl', align: 'center',title: '璇锋眰閾炬帴'}
+ ,{field: 'reqParams', align: 'center',title: '璇锋眰鍙傛暟'}
+ ,{field: 'resParams', align: 'center',title: '杩斿洖鍙傛暟'}
+ ,{field: 'result$', align: 'center',title: '缁撴灉',width:100}
+ ,{field: 'appeTime$', align: 'center',title: '寤烘。鏃堕棿',width:150}
+
+ // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(erpreqLog)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(erpreqLog)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ var ids = checkStatus.map(function (d) {
+ return d.id;
+ });
+ del(ids);
+ break;
+ case 'exportData':
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'erpreqLog': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/erpreqLog/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(erpreqLog)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ var ids = [data.id];
+ del(ids);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender();
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/erpreqLog/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/erpreqLog/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender() {
+ layDate.render({
+ elem: '#appeTime\\$',
+ type: 'datetime'
+ });
+
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/static/js/handWrkMast/handWrkMast.js b/src/main/webapp/static/js/handWrkMast/handWrkMast.js
index 686640d..b7502f2 100644
--- a/src/main/webapp/static/js/handWrkMast/handWrkMast.js
+++ b/src/main/webapp/static/js/handWrkMast/handWrkMast.js
@@ -28,12 +28,10 @@
,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈�', hide:true}
,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯', hide:true}
,{field: 'staNo$', align: 'center',title: '鐩爣绔�', hide:true}
- ,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�', hide:true}
- ,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅', hide:true}
+ ,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'}
+ ,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide:true}
-
,{field: 'manuType', align: 'center',title: '澶勭悊鏂瑰紡'}
-
,{field: 'modiUser$', align: 'center',title: '鎿嶄綔浜哄憳'}
,{field: 'modiTime$', align: 'center',title: '鎿嶄綔鏃堕棿'}
diff --git a/src/main/webapp/views/erpreqLog/erpreqLog.html b/src/main/webapp/views/erpreqLog/erpreqLog.html
new file mode 100644
index 0000000..560f303
--- /dev/null
+++ b/src/main/webapp/views/erpreqLog/erpreqLog.html
@@ -0,0 +1,135 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 鎼滅储鏍� -->
+<div id="search-box" class="layui-form layui-card-header">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="log_type" placeholder="鏃ュ織绫诲瀷" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="result" placeholder="鎵ц缁撴灉" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <!-- 鏃ユ湡鑼冨洿 -->
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="appe_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <!-- 寰呮坊鍔� -->
+ <div id="data-search-btn" class="layui-btn-container layui-form-item">
+ <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+ <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+ </div>
+</div>
+
+<!-- 琛ㄦ牸 -->
+<div class="layui-form">
+ <table class="layui-hide" id="erpreqLog" lay-filter="erpreqLog"></table>
+</div>
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
+<!-- <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>-->
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/erpreqLog/erpreqLog.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏃ュ織绫诲瀷: </label>
+ <div class="layui-input-block">
+ <select name="logType">
+ <option value="">璇烽�夋嫨鏃ュ織绫诲瀷</option>
+ <option value="1">鍏ュ簱</option>
+ <option value="2">鍏ュ簱鏇存柊</option>
+ <option value="3">鍑哄簱</option>
+ <option value="4">鍑哄簱鏇存柊</option>
+ <option value="5">鐩樼偣</option>
+ <option value="6">鐩樼偣鏇存柊</option>
+ <option value="7">搴撳瓨鍚屾</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">璇锋眰閾炬帴: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="reqUrl" placeholder="璇疯緭鍏ヨ姹傞摼鎺�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="reqParams" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="resParams" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">缁撴灉: </label>
+ <div class="layui-input-block">
+ <select name="result">
+ <option value="">璇烽�夋嫨缁撴灉</option>
+ <option value="0">鎴愬姛</option>
+ <option value="1">澶辫触</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">寤烘。鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="appeTime" id="appeTime$" placeholder="璇疯緭鍏ュ缓妗ｆ椂闂�">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
--
Gitblit v1.9.1