From bc427c64d8c9066eda7a817c7c7926954e39abb0 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期一, 26 一月 2026 14:55:26 +0800
Subject: [PATCH] 删除操作添加日志记录，系统添加定时删除操作日志
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutStockChangePR.java | 4
fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java | 4
fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/SystemScheduled.java | 76 ++++++
fzzy-igdss-view/src/main/java/com/fzzy/igds/FoodPricePR.java | 4
fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java | 4
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutDataPR.java | 4
fzzy-igdss-view/src/main/java/com/fzzy/igds/CameraMediaPR.java | 4
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java | 7
fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityConfPR.java | 4
fzzy-igdss-view/src/main/java/com/fzzy/igds/SecCameraPR.java | 6
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutConfPR.java | 4
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/monitor/SysOperlogController.java | 7
fzzy-igdss-view/src/main/java/com/fzzy/igds/GatewaySerPR.java | 4
fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContractPR.java | 4
fzzy-igdss-view/src/main/java/com/fzzy/igds/SloganPR.java | 6
fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotConfPR.java | 4
fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceIotPR.java | 125 +++++-----
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutLossOverPR.java | 4
fzzy-igdss-web/src/main/java/com/fzzy/grain/GrainController.java | 4
fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceSerPR.java | 4
fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java | 4
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DicService.java | 16 +
fzzy-igdss-view/src/main/java/com/fzzy/igds/DicAreaPR.java | 4
fzzy-igdss-view/src/main/java/com/fzzy/igds/BankPR.java | 4
fzzy-igdss-web/src/main/resources/templates/monitor/operlog/operlog.html | 382 +++++++++++++++++--------------
25 files changed, 451 insertions(+), 242 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DicService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DicService.java
index d55fb16..529b2ef 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DicService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DicService.java
@@ -1,5 +1,6 @@
package com.fzzy.igds.service;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.constant.*;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.work.data.WorkStatus;
@@ -390,4 +391,19 @@
list.add(new SysDictData("鍑哄簱", Constant.TYPE_OUT));
return list;
}
+
+ /**
+ *
+ * @return
+ */
+ public List<SysDictData> getBizType() {
+ List<SysDictData> list = new ArrayList<SysDictData>();
+ list.add(new SysDictData(BizTypeEnum.SYS.getMsg(), BizTypeEnum.SYS.getCode()));
+ list.add(new SysDictData(BizTypeEnum.INOUT.getMsg(), BizTypeEnum.INOUT.getCode()));
+ list.add(new SysDictData(BizTypeEnum.GRAIN.getMsg(), BizTypeEnum.GRAIN.getCode()));
+ list.add(new SysDictData(BizTypeEnum.SECURITY.getMsg(), BizTypeEnum.SECURITY.getCode()));
+ list.add(new SysDictData(BizTypeEnum.SUPERVISION.getMsg(), BizTypeEnum.SUPERVISION.getCode()));
+ list.add(new SysDictData(BizTypeEnum.SCREEN.getMsg(), BizTypeEnum.SCREEN.getCode()));
+ return list;
+ }
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/SystemScheduled.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/SystemScheduled.java
new file mode 100644
index 0000000..7a2b0ec
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/SystemScheduled.java
@@ -0,0 +1,76 @@
+package com.fzzy.igds.timer;
+
+import com.fzzy.common.constant.BizTypeEnum;
+import com.ruoyi.common.config.FrameworkConfig;
+import com.ruoyi.common.enums.BusinessStatus;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.OperatorType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.SysCompany;
+import com.ruoyi.system.domain.SysOperLog;
+import com.ruoyi.system.service.ISysCompanyService;
+import com.ruoyi.system.service.ISysOperLogService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@EnableScheduling
+@Slf4j
+@Component
+public class SystemScheduled {
+
+
+ @Resource
+ private ISysOperLogService operLogService;
+
+ @Resource
+ private ISysCompanyService companyService;
+
+ @Resource
+ private ISysOperLogService sysOperLogService;
+
+ /**
+ *
+ */
+ @Scheduled(cron = "0 0 1 */30 * ?")
+ public void cronJob1() {
+ try {
+ log.info("------------姣�30澶╃殑鍑屾櫒1鐐规墽琛屾竻闄ゆ搷浣滄棩蹇楀紑濮�------------");
+ //鎵ц娓呴櫎鏃ュ織鏂规硶
+ doCronHob1();
+ //娣诲姞娓呴櫎鏃ュ織璁板綍
+ SysOperLog operLog = new SysOperLog();
+ operLog.setStatus(BusinessStatus.SUCCESS.ordinal());
+ operLog.setMethod("com.fzzy.igds.timer.SystemScheduled.cronJob1()");
+ operLog.setCompanyId(FrameworkConfig.getCompanyId());
+ operLog.setBusinessType(BusinessType.CLEAN.ordinal());
+ operLog.setTitle("瀹氭椂浠诲姟锛屽畾鏃舵竻闄ゆ搷浣滄棩蹇�");
+ operLog.setOperatorType(OperatorType.MANAGE.ordinal());
+ operLog.setBizType(BizTypeEnum.SYS.getCode());
+ operLog.setOperName(FrameworkConfig.getName());
+ operLog.setOperTime(new Date());
+ sysOperLogService.insertOperlog(operLog);
+ log.info("------------姣�30澶╃殑鍑屾櫒1鐐规墽琛屾竻闄ゆ搷浣滄棩蹇楃粨鏉�------------");
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
+
+ }
+
+ public void doCronHob1() {
+
+ //鑾峰彇绯荤粺涓墍鏈夌殑companyId
+ List<SysCompany> sysCompanies = companyService.selectAll();
+ for (SysCompany sysCompany : sysCompanies) {
+ if (StringUtils.isNotBlank(sysCompany.getCompanyId())) {
+ log.info("------------娓呴櫎缁勭粐缂栫爜銆恵}銆戞搷浣滄棩蹇�------------", sysCompany.getCompanyId());
+ operLogService.cleanOperLog(sysCompany.getCompanyId());
+ }
+ }
+ }
+}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/BankPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/BankPR.java
index f817bcd..edeb9ac 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/BankPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/BankPR.java
@@ -3,10 +3,13 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.Bank;
import com.fzzy.igds.service.BankService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -55,6 +58,7 @@
* @return
*/
@Expose
+ @Log(title = "閾惰绠＄悊", businessType = BusinessType.DELETE,bizType = BizTypeEnum.SYS)
public BaseResp delete(Bank bank){
if(StringUtils.isNotEmpty(bank.getId())) return bankService.deleteData(bank);
return BaseResp.success();
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/CameraMediaPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/CameraMediaPR.java
index 4122dce..2316b4b 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/CameraMediaPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/CameraMediaPR.java
@@ -3,9 +3,12 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.camera.data.ydqly.YdQlyNode;
import com.fzzy.igds.domain.CameraMedia;
import com.fzzy.igds.service.CameraMediaService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -54,6 +57,7 @@
* @return 寮傚父淇℃伅
*/
@Expose
+ @Log(title = "娴佸獟浣撻厤缃�", businessType = BusinessType.DELETE,bizType = BizTypeEnum.SECURITY)
public String delData(CameraMedia data) {
if (StringUtils.isEmpty(data.getId())) {
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotConfPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotConfPR.java
index 97bec2f..7400383 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotConfPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotConfPR.java
@@ -3,8 +3,11 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.domain.DepotConf;
import com.fzzy.igds.service.DepotConfService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
@@ -52,6 +55,7 @@
* @param conf
*/
@Expose
+ @Log(title = "绮儏閰嶇疆", businessType = BusinessType.DELETE,bizType = BizTypeEnum.GRAIN)
public void delDepotConf(DepotConf conf) {
DepotConf depotConf = new DepotConf();
BeanUtils.copyProperties(conf, depotConf);
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
index 6d83f09..1d60830 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
@@ -3,10 +3,13 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.service.DepotService;
import com.fzzy.igds.service.PledgeContractService;
import com.fzzy.igds.utils.ContextUtil;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -67,6 +70,7 @@
*/
@Expose
@Transactional
+ @Log(title = "搴撳尯绠＄悊", businessType = BusinessType.DELETE,bizType = BizTypeEnum.SYS)
public void deleteDepot(Depot data) {
Depot depot = new Depot();
BeanUtils.copyProperties(data, depot);
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceIotPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceIotPR.java
index 7ec57a9..634a9ae 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceIotPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceIotPR.java
@@ -6,12 +6,16 @@
import com.bstek.dorado.data.entity.EntityState;
import com.bstek.dorado.data.entity.EntityUtils;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.data.DeviceIotParam;
import com.fzzy.igds.domain.DeviceIot;
import com.fzzy.igds.service.DeviceIotService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
+
import javax.annotation.Resource;
import java.util.List;
@@ -23,68 +27,69 @@
@Component
public class DeviceIotPR {
- @Resource
- private DeviceIotService deviceIotService;
+ @Resource
+ private DeviceIotService deviceIotService;
- /**
- * 鏌ヨ璁惧,灏嗘搷浣滀俊鎭皟鏁翠负绌�
- *
- * deviceIotPR#loadDeviceIotPage
- *
- * @param page
- * @param param
- * @return
- */
- @DataProvider
- public void loadDeviceIotPage(Page<DeviceIot> page, DeviceIotParam param) {
- com.baomidou.mybatisplus.extension.plugins.pagination.Page<DeviceIot> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPageNo(), page.getPageSize());
+ /**
+ * 鏌ヨ璁惧,灏嗘搷浣滀俊鎭皟鏁翠负绌�
+ * <p>
+ * deviceIotPR#loadDeviceIotPage
+ *
+ * @param page
+ * @param param
+ * @return
+ */
+ @DataProvider
+ public void loadDeviceIotPage(Page<DeviceIot> page, DeviceIotParam param) {
+ com.baomidou.mybatisplus.extension.plugins.pagination.Page<DeviceIot> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPageNo(), page.getPageSize());
- if(null == param) {
- param = new DeviceIotParam();
- }
- deviceIotService.listPageData(corePage, param);
+ if (null == param) {
+ param = new DeviceIotParam();
+ }
+ deviceIotService.listPageData(corePage, param);
- // 閲嶆柊灏佽
- page.setEntities(corePage.getRecords());
- page.setEntityCount(Integer.parseInt(String.valueOf(corePage.getTotal())));
- }
+ // 閲嶆柊灏佽
+ page.setEntities(corePage.getRecords());
+ page.setEntityCount(Integer.parseInt(String.valueOf(corePage.getTotal())));
+ }
- /**
- * 淇濆瓨 devicePR#saveAll
- *
- * @param depotDeviceIots
- * @return
- */
- @DataResolver
- @Transactional
- public String saveAll(List<DeviceIot> depotDeviceIots) {
- String msg = "";
- DeviceIot deviceIot;
- for (DeviceIot depotDeviceIot : depotDeviceIots) {
- EntityState state = EntityUtils.getState(depotDeviceIot);
- deviceIot = new DeviceIot();
- BeanUtils.copyProperties(depotDeviceIot, deviceIot);
- if (state == EntityState.NEW) {
- deviceIotService.updateDeviceIot(deviceIot);
- msg = "娣诲姞鎴愬姛!";
- }
- if (state == EntityState.DELETED) {
- deviceIotService.delDepotDeviceIot(deviceIot);
- msg = "鍒犻櫎鎴愬姛!";
- }
- if (state == EntityState.MODIFIED) {
- deviceIotService.updateDeviceIot(deviceIot);
- msg = "淇敼鎴愬姛!";
- }
- }
- return msg;
- }
-
- /**
- * devicePR#refreshCache
- */
- @Expose
- public void refreshCache(){
- deviceIotService.refreshCache(null);
- }
+ /**
+ * 淇濆瓨 devicePR#saveAll
+ *
+ * @param depotDeviceIots
+ * @return
+ */
+ @DataResolver
+ @Transactional
+ @Log(title = "Iot璁惧閰嶇疆", businessType = BusinessType.OTHER, bizType = BizTypeEnum.SYS)
+ public String saveAll(List<DeviceIot> depotDeviceIots) {
+ String msg = "";
+ DeviceIot deviceIot;
+ for (DeviceIot depotDeviceIot : depotDeviceIots) {
+ EntityState state = EntityUtils.getState(depotDeviceIot);
+ deviceIot = new DeviceIot();
+ BeanUtils.copyProperties(depotDeviceIot, deviceIot);
+ if (state == EntityState.NEW) {
+ deviceIotService.updateDeviceIot(deviceIot);
+ msg = "娣诲姞鎴愬姛!";
+ }
+ if (state == EntityState.DELETED) {
+ deviceIotService.delDepotDeviceIot(deviceIot);
+ msg = "鍒犻櫎鎴愬姛!";
+ }
+ if (state == EntityState.MODIFIED) {
+ deviceIotService.updateDeviceIot(deviceIot);
+ msg = "淇敼鎴愬姛!";
+ }
+ }
+ return msg;
+ }
+
+ /**
+ * devicePR#refreshCache
+ */
+ @Expose
+ public void refreshCache() {
+ deviceIotService.refreshCache(null);
+ }
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceSerPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceSerPR.java
index 3b9a3dc..58caaab 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceSerPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceSerPR.java
@@ -3,8 +3,11 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.domain.DeviceSer;
import com.fzzy.igds.service.DeviceSerService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -63,6 +66,7 @@
*/
@Expose
@Transactional
+ @Log(title = "鍒嗘満閰嶇疆", businessType = BusinessType.DELETE,bizType = BizTypeEnum.SYS)
public void delSerById(String id) {
DeviceSer ser = deviceSerService.getDataById(null, id);
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DicAreaPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DicAreaPR.java
index 982766c..61d4821 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DicAreaPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DicAreaPR.java
@@ -4,8 +4,11 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.domain.DicArea;
import com.fzzy.igds.service.DicAreaService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
@@ -69,6 +72,7 @@
* @return
*/
@Expose
+ @Log(title = "鍖哄垝瀛楀吀", businessType = BusinessType.DELETE,bizType = BizTypeEnum.SYS)
public String delDicArea(DicArea data) {
DicArea dicArea = new DicArea();
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/FoodPricePR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/FoodPricePR.java
index 45aa095..3403723 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/FoodPricePR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/FoodPricePR.java
@@ -3,8 +3,11 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.domain.FoodPrice;
import com.fzzy.igds.service.FoodPriceService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
@@ -51,6 +54,7 @@
* @return
*/
@Expose
+ @Log(title = "绮簱浠锋牸", businessType = BusinessType.DELETE,bizType = BizTypeEnum.INOUT)
public String delData(FoodPrice data) {
FoodPrice foodPrice = new FoodPrice();
BeanUtils.copyProperties(data, foodPrice);
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/GatewaySerPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/GatewaySerPR.java
index f8f035b..36bde7d 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/GatewaySerPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/GatewaySerPR.java
@@ -3,8 +3,11 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.domain.GatewaySer;
import com.fzzy.igds.service.GatewaySerService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -49,6 +52,7 @@
*/
@Expose
@Transactional
+ @Log(title = "缃戝叧閰嶇疆", businessType = BusinessType.DELETE,bizType = BizTypeEnum.SYS)
public void delSerById(String id) {
GatewaySer ser = gatewaySerService.getById(id);
gatewaySerService.delSer(ser);
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutConfPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutConfPR.java
index 4ae2263..0e07030 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutConfPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutConfPR.java
@@ -2,8 +2,11 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.Expose;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.service.InoutConfService;
import com.fzzy.igds.domain.InoutConf;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -51,6 +54,7 @@
* @return
*/
@Expose
+ @Log(title = "鍑哄叆搴撻厤缃�", businessType = BusinessType.DELETE,bizType = BizTypeEnum.INOUT)
public String delData(InoutConf data) {
InoutConf inoutConf = new InoutConf();
BeanUtils.copyProperties(data, inoutConf);
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutDataPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutDataPR.java
index ed11698..f62ec90 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutDataPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutDataPR.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.InoutData;
@@ -16,7 +17,9 @@
import com.fzzy.igds.service.InoutNoticeService;
import com.fzzy.igds.service.InoutRecordService;
import com.fzzy.igds.utils.ContextUtil;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils;
@@ -90,6 +93,7 @@
*/
@DataResolver
@Transactional
+ @Log(title = "鍑哄叆搴撴暟鎹墽琛屽紓甯哥粓姝�", businessType = BusinessType.UPDATE,bizType = BizTypeEnum.INOUT)
public String errorInoutData(InoutRecord data) {
return inoutRecordService.errorInoutData(data);
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutLossOverPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutLossOverPR.java
index 8ab3b4f..363f6ec 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutLossOverPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutLossOverPR.java
@@ -4,9 +4,12 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.InoutLossOver;
import com.fzzy.igds.service.InoutLossOverService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -62,6 +65,7 @@
* @return
*/
@Expose
+ @Log(title = "鎹熺泭绠＄悊", businessType = BusinessType.DELETE,bizType = BizTypeEnum.INOUT)
public String delData(InoutLossOver data) {
InoutLossOver item = new InoutLossOver();
BeanUtils.copyProperties(data, item);
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java
index 11ca6bf..3f45655 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java
@@ -5,6 +5,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.NoticeDto;
@@ -14,7 +15,9 @@
import com.fzzy.igds.domain.InoutNoticeOut;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.work.data.WorkStatus;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
@@ -116,6 +119,7 @@
* inoutNoticePR#delDataIn
*/
@Expose
+ @Log(title = "閫氱煡鍗曠鐞�", businessType = BusinessType.DELETE,bizType = BizTypeEnum.INOUT)
public String delDataIn(InoutNoticeIn data) {
InoutNoticeIn inoutNoticeIn = new InoutNoticeIn();
BeanUtils.copyProperties(data, inoutNoticeIn);
@@ -211,7 +215,8 @@
* inoutNoticePR#delDataOut
*/
@Expose
- public String delDataOut(InoutNoticeOut data) {
+ @Log(title = "閫氱煡鍗曠鐞�", businessType = BusinessType.DELETE,bizType = BizTypeEnum.INOUT)
+ public String delDataOut(InoutNoticeOut data) {
InoutNoticeOut inoutNoticeOut = new InoutNoticeOut();
BeanUtils.copyProperties(data, inoutNoticeOut);
return inoutNoticeService.delDataOut(inoutNoticeOut);
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutStockChangePR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutStockChangePR.java
index a09146a..b891699 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutStockChangePR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutStockChangePR.java
@@ -4,8 +4,11 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.domain.InoutStockChange;
import com.fzzy.igds.service.InoutStockChangeService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
@@ -64,6 +67,7 @@
* @return
*/
@Expose
+ @Log(title = "鍊掍粨绉诲簱", businessType = BusinessType.DELETE,bizType = BizTypeEnum.INOUT)
public String delData(InoutStockChange data) {
InoutStockChange item = new InoutStockChange();
BeanUtils.copyProperties(data, item);
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java
index c07ff6e..aea2e71 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.data.PatrolSuperData;
@@ -11,6 +12,8 @@
import com.fzzy.igds.service.CoreDeptService;
import com.fzzy.igds.service.PatrolService;
import com.fzzy.igds.utils.DateUtil;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -147,6 +150,7 @@
* @return
*/
@Expose
+ @Log(title = "宸℃閰嶇疆", businessType = BusinessType.DELETE,bizType = BizTypeEnum.SECURITY)
public BaseResp deletePatrolConf(PatrolConf bank){
if(StringUtils.isNotEmpty(bank.getId())) return patrolService.deletePatrolConf(bank);
return BaseResp.success();
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContractPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContractPR.java
index 2393f60..35f46ea 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContractPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContractPR.java
@@ -3,14 +3,17 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.PledgeContract;
import com.fzzy.igds.service.PledgeContractService;
import com.fzzy.igds.utils.ContextUtil;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.enums.BusinessType;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -72,6 +75,7 @@
* @param pledgeContract
* @return
*/
+ @Log( title = "璐ㄦ娂鍚堝悓", businessType = BusinessType.DELETE,bizType = BizTypeEnum.SUPERVISION)
@Expose
public BaseResp delete(PledgeContract pledgeContract) {
if (StringUtils.isNotEmpty(pledgeContract.getId())) return pledgeContractService.deleteData(pledgeContract);
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityConfPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityConfPR.java
index 54b8595..8441a13 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityConfPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityConfPR.java
@@ -3,10 +3,13 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.domain.QuantityConf;
import com.fzzy.igds.service.DepotService;
import com.fzzy.igds.service.QuantityService;
import com.fzzy.igds.utils.ContextUtil;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -53,6 +56,7 @@
* @return
*/
@Expose
+ @Log(title = "鍒犻櫎鏁伴噺鐩戞祴鍙傛暟閰嶇疆", businessType = BusinessType.DELETE,bizType = BizTypeEnum.GRAIN)
public String delQuantityConf(QuantityConf conf) {
QuantityConf quantityConf = new QuantityConf();
BeanUtils.copyProperties(conf, quantityConf);
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SecCameraPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SecCameraPR.java
index 8f362b2..e27de59 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SecCameraPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SecCameraPR.java
@@ -4,13 +4,14 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.camera.ApiCameraManager;
import com.fzzy.igds.camera.data.ApiCameraData;
-import com.fzzy.igds.camera.data.ApiCameraResp;
-import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.Camera;
import com.fzzy.igds.service.SecCameraService;
import com.fzzy.igds.utils.ContextUtil;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -86,6 +87,7 @@
* @return
*/
@Expose
+ @Log(title = "鐩戞帶閰嶇疆", businessType = BusinessType.DELETE, bizType = BizTypeEnum.SECURITY)
public String delCamera(Camera data) {
Camera secCamera = new Camera();
BeanUtils.copyProperties(data, secCamera);
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SloganPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SloganPR.java
index c35dfd9..b2c2b29 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SloganPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SloganPR.java
@@ -5,6 +5,7 @@
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.entity.EntityState;
import com.bstek.dorado.data.entity.EntityUtils;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.OrderRespEnum;
import com.fzzy.igds.domain.Slogan;
@@ -12,6 +13,8 @@
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.websocket.WebSocketPacket;
import com.fzzy.igds.websocket.WebSocketServer;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -78,7 +81,8 @@
* @return
*/
@Expose
- public void delData(Slogan data) {
+ @Log(title = "澶у睆鏍囪", businessType = BusinessType.DELETE,bizType = BizTypeEnum.SYS)
+ public void delData(Slogan data) {
Slogan slogan = new Slogan();
BeanUtils.copyProperties(data, slogan);
sloganService.delData(slogan);
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java
index ce38f11..2af3a6b 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.work.domain.WorkOrder;
@@ -14,8 +15,10 @@
import com.fzzy.work.service.WorkOrderConfService;
import com.fzzy.work.service.WorkOrderProcessService;
import com.fzzy.work.service.WorkOrderService;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.enums.BusinessType;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
@@ -149,6 +152,7 @@
*
*/
@Expose
+ @Log(title = "宸ュ崟閰嶇疆", businessType = BusinessType.DELETE,bizType = BizTypeEnum.INOUT)
public BaseResp deleteConf(WorkOrderConf data) {
WorkOrderConf newData = new WorkOrderConf();
BeanUtils.copyProperties(data, newData);
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/grain/GrainController.java b/fzzy-igdss-web/src/main/java/com/fzzy/grain/GrainController.java
index a2eb0de..59bad0b 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/grain/GrainController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/grain/GrainController.java
@@ -1,5 +1,6 @@
package com.fzzy.grain;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.grain.manager.GrainManager;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.DepotType;
@@ -9,7 +10,9 @@
import com.fzzy.igds.response.GrainResponse;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.common.manager.CommonManager;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
@@ -299,6 +302,7 @@
*
* @return
*/
+ @Log(title = "娓呴櫎鎵ц璁板綍", businessType = BusinessType.CLEAN,bizType = BizTypeEnum.GRAIN)
@ResponseBody
@RequestMapping("/clean-order-list")
public PageResponse<String> cleanOrderList(@RequestBody IgdsBaseParam param) {
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/monitor/SysOperlogController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/monitor/SysOperlogController.java
index e64f110..6049350 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/monitor/SysOperlogController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/monitor/SysOperlogController.java
@@ -1,5 +1,6 @@
package com.fzzy.sys.controller.monitor;
+import com.fzzy.igds.service.DicService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -30,9 +31,13 @@
@Autowired
private ISysOperLogService operLogService;
+ @Autowired
+ private DicService dicService;
+
@RequiresPermissions("monitor:operlog:view")
@GetMapping()
- public String operlog() {
+ public String operlog(ModelMap mmap) {
+ mmap.put("bizTypeDatas", dicService.getBizType());
return prefix + "/operlog";
}
diff --git a/fzzy-igdss-web/src/main/resources/templates/monitor/operlog/operlog.html b/fzzy-igdss-web/src/main/resources/templates/monitor/operlog/operlog.html
index 0736f09..1f7777a 100644
--- a/fzzy-igdss-web/src/main/resources/templates/monitor/operlog/operlog.html
+++ b/fzzy-igdss-web/src/main/resources/templates/monitor/operlog/operlog.html
@@ -1,188 +1,216 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
- <th:block th:include="include :: header('鎿嶄綔鏃ュ織鍒楄〃')" />
- <th:block th:include="include :: bootstrap-select-css" />
+ <th:block th:include="include :: header('鎿嶄綔鏃ュ織鍒楄〃')"/>
+ <th:block th:include="include :: bootstrap-select-css"/>
</head>
<body class="gray-bg">
- <div class="container-div">
- <div class="row">
- <div class="col-sm-12 search-collapse">
- <form id="operlog-form">
- <div class="select-list">
- <ul>
- <li>
- <label>鎿嶄綔鍦板潃锛�</label><input type="text" name="operIp"/>
- </li>
- <li>
- <label>绯荤粺妯″潡锛� </label><input type="text" name="title"/>
- </li>
- <li>
- <label>鎿嶄綔浜哄憳锛� </label><input type="text" name="operName"/>
- </li>
- <li class="select-selectpicker">
- <label>鎿嶄綔绫诲瀷锛� </label><select id="businessTypes" name="businessTypes" th:with="type=${@dict.getType('sys_oper_type')}" class="selectpicker" data-none-selected-text="璇烽�夋嫨" multiple>
- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
- </select>
- </li>
- <li>
- <label>鎿嶄綔鐘舵�侊細</label><select name="status" th:with="type=${@dict.getType('sys_common_status')}">
- <option value="">鎵�鏈�</option>
- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
- </select>
- </li>
- <li class="select-time">
- <label>鎿嶄綔鏃堕棿锛� </label>
- <input type="text" class="time-input" id="startTime" placeholder="寮�濮嬫椂闂�"/>
- <span>-</span>
- <input type="text" class="time-input" id="endTime" placeholder="缁撴潫鏃堕棿"/>
- </li>
- <li>
- <a class="btn btn-primary btn-rounded btn-sm" onclick="searchPre()"><i class="fa fa-search"></i> 鎼滅储</a>
- <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i> 閲嶇疆</a>
- </li>
- </ul>
- </div>
- </form>
- </div>
-
- <div class="btn-group-sm" id="toolbar" role="group">
- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="monitor:operlog:remove">
- <i class="fa fa-remove"></i> 鍒犻櫎
- </a>
- <a class="btn btn-danger" onclick="$.operate.clean()" shiro:hasPermission="monitor:operlog:remove">
- <i class="fa fa-trash"></i> 娓呯┖
- </a>
- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="monitor:operlog:export">
- <i class="fa fa-download"></i> 瀵煎嚭
- </a>
- </div>
-
- <div class="col-sm-12 select-table table-striped">
- <table id="bootstrap-table"></table>
- </div>
- </div>
- </div>
-
- <th:block th:include="include :: footer" />
- <th:block th:include="include :: bootstrap-select-js" />
- <script th:inline="javascript">
- var detailFlag = [[${@permission.hasPermi('monitor:operlog:detail')}]];
- var datas = [[${@dict.getType('sys_oper_type')}]];
- var prefix = ctx + "monitor/operlog";
+<div class="container-div">
+ <div class="row">
+ <div class="col-sm-12 search-collapse">
+ <form id="operlog-form">
+ <div class="select-list">
+ <ul>
+ <li>
+ <label>鎿嶄綔鍦板潃锛�</label><input type="text" name="operIp"/>
+ </li>
+ <li>
+ <label>绯荤粺妯″潡锛� </label><input type="text" name="title"/>
+ </li>
+ <li class="select-selectpicker">
+ <label>涓氬姟绫诲瀷锛� </label>
+ <select id="bizType" name="bizType"
+ class="selectpicker" data-none-selected-text="璇烽�夋嫨">
+ <option value="">鎵�鏈�</option>
+ <option th:each="dict : ${bizTypeDatas}" th:text="${dict.dictLabel}"
+ th:value="${dict.dictValue}"></option>
+ </select>
+ </li>
+ <li>
+ <label>鎿嶄綔浜哄憳锛� </label><input type="text" name="operName"/>
+ </li>
+ <li class="select-selectpicker">
+ <label>鎿嶄綔绫诲瀷锛� </label><select id="businessTypes" name="businessTypes"
+ th:with="type=${@dict.getType('sys_oper_type')}"
+ class="selectpicker" data-none-selected-text="璇烽�夋嫨"
+ multiple>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+ th:value="${dict.dictValue}"></option>
+ </select>
+ </li>
+ <li>
+ <label>鎿嶄綔鐘舵�侊細</label><select name="status"
+ th:with="type=${@dict.getType('sys_common_status')}">
+ <option value="">鎵�鏈�</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+ th:value="${dict.dictValue}"></option>
+ </select>
+ </li>
+ <li class="select-time">
+ <label>鎿嶄綔鏃堕棿锛� </label>
+ <input type="text" class="time-input" id="startTime" placeholder="寮�濮嬫椂闂�"/>
+ <span>-</span>
+ <input type="text" class="time-input" id="endTime" placeholder="缁撴潫鏃堕棿"/>
+ </li>
+ <li>
+ <a class="btn btn-primary btn-rounded btn-sm" onclick="searchPre()"><i
+ class="fa fa-search"></i> 鎼滅储</a>
+ <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i
+ class="fa fa-refresh"></i> 閲嶇疆</a>
+ </li>
+ </ul>
+ </div>
+ </form>
+ </div>
- $(function() {
- var options = {
- url: prefix + "/list",
- cleanUrl: prefix + "/clean",
- detailUrl: prefix + "/detail/{id}",
- removeUrl: prefix + "/remove",
- exportUrl: prefix + "/export",
- queryParams: queryParams,
- sortName: "operTime",
- sortOrder: "desc",
- modalName: "鎿嶄綔鏃ュ織",
- escape: true,
- showPageGo: true,
- rememberSelected: true,
- columns: [{
- field: 'state',
- checkbox: true
- },
- {
- field: 'operId',
- title: '鏃ュ織缂栧彿'
- },
- {
- field: 'title',
- title: '绯荤粺妯″潡',
- formatter: function(value, row, index) {
+ <div class="btn-group-sm" id="toolbar" role="group">
+ <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
+ shiro:hasPermission="monitor:operlog:remove">
+ <i class="fa fa-remove"></i> 鍒犻櫎
+ </a>
+ <a class="btn btn-danger" onclick="$.operate.clean()" shiro:hasPermission="monitor:operlog:remove">
+ <i class="fa fa-trash"></i> 娓呯┖
+ </a>
+ <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="monitor:operlog:export">
+ <i class="fa fa-download"></i> 瀵煎嚭
+ </a>
+ </div>
+
+ <div class="col-sm-12 select-table table-striped">
+ <table id="bootstrap-table"></table>
+ </div>
+ </div>
+</div>
+
+<th:block th:include="include :: footer"/>
+<th:block th:include="include :: bootstrap-select-js"/>
+<script th:inline="javascript">
+ var detailFlag = [[${@permission.hasPermi('monitor:operlog:detail')}]];
+ var datas = [[${@dict.getType('sys_oper_type')}]];
+ var bizTypeDatas = [[${bizTypeDatas}]];
+
+ var prefix = ctx + "monitor/operlog";
+
+ $(function () {
+ var options = {
+ url: prefix + "/list",
+ cleanUrl: prefix + "/clean",
+ detailUrl: prefix + "/detail/{id}",
+ removeUrl: prefix + "/remove",
+ exportUrl: prefix + "/export",
+ queryParams: queryParams,
+ sortName: "operTime",
+ sortOrder: "desc",
+ modalName: "鎿嶄綔鏃ュ織",
+ escape: true,
+ showPageGo: true,
+ rememberSelected: true,
+ columns: [{
+ field: 'state',
+ checkbox: true
+ },
+ {
+ field: 'operId',
+ title: '鏃ュ織缂栧彿'
+ },
+ {
+ field: 'title',
+ title: '绯荤粺妯″潡',
+ formatter: function (value, row, index) {
return $.table.tooltip(value);
}
},
- {
- field: 'businessType',
- title: '鎿嶄綔绫诲瀷',
- align: 'center',
- formatter: function(value, row, index) {
- return $.table.selectDictLabel(datas, value);
- }
- },
- {
- field: 'operName',
- title: '鎿嶄綔浜哄憳',
- sortable: true
- },
- {
- field: 'deptName',
- title: '閮ㄩ棬鍚嶇О'
- },
- {
- field: 'operIp',
- title: '鎿嶄綔鍦板潃'
- },
- {
- field: 'operLocation',
- title: '鎿嶄綔鍦扮偣'
- },
- {
- field: 'status',
- title: '鎿嶄綔鐘舵��',
- align: 'center',
- formatter: function(value, row, index) {
- if (value == 0) {
- return '<span class="badge badge-primary">鎴愬姛</span>';
- } else if (value == 1) {
- return '<span class="badge badge-danger">澶辫触</span>';
- }
- }
- },
- {
- field: 'operTime',
- title: '鎿嶄綔鏃堕棿',
- sortable: true
- },
- {
- field: 'costTime',
- title: '娑堣�楁椂闂�',
- sortable: true,
- formatter: function(value, row, index) {
- return $.common.sprintf("%s姣", value);
- }
- },
- {
- title: '鎿嶄綔',
- align: 'center',
- formatter: function(value, row, index) {
- var actions = [];
- actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.operId + '\')"><i class="fa fa-search"></i>璇︾粏</a>');
- return actions.join('');
- }
- }]
- };
- $.table.init(options);
- });
-
- function queryParams(params) {
- var search = $.table.queryParams(params);
- search.params = {
- beginTime : beginOfTime($("#startTime").val()),
- endTime : endOfTime($("#endTime").val())
- };
- search.businessTypes = $.common.join($('#businessTypes').selectpicker('val'));
- return search;
- }
-
- function searchPre() {
- $.table.search('operlog-form', 'bootstrap-table');
- }
-
- function resetPre() {
- resetDate();
- $("#operlog-form")[0].reset();
- $("#businessTypes").selectpicker('refresh');
- $.table.search('operlog-form', 'bootstrap-table', 1);
- }
- </script>
+ {
+ field: 'businessType',
+ title: '鎿嶄綔绫诲瀷',
+ align: 'center',
+ formatter: function (value, row, index) {
+ return $.table.selectDictLabel(datas, value);
+ }
+ },
+ {
+ field: 'bizType',
+ title: '涓氬姟绫诲瀷',
+ align: 'center',
+ formatter: function (value, row, index) {
+ return $.table.selectDictLabel(bizTypeDatas, value);
+ }
+ },
+ {
+ field: 'operName',
+ title: '鎿嶄綔浜哄憳',
+ sortable: true
+ },
+ {
+ field: 'deptName',
+ title: '閮ㄩ棬鍚嶇О'
+ },
+ {
+ field: 'operIp',
+ title: '鎿嶄綔鍦板潃'
+ },
+ {
+ field: 'operLocation',
+ title: '鎿嶄綔鍦扮偣'
+ },
+ {
+ field: 'status',
+ title: '鎿嶄綔鐘舵��',
+ align: 'center',
+ formatter: function (value, row, index) {
+ if (value == 0) {
+ return '<span class="badge badge-primary">鎴愬姛</span>';
+ } else if (value == 1) {
+ return '<span class="badge badge-danger">澶辫触</span>';
+ }
+ }
+ },
+ {
+ field: 'operTime',
+ title: '鎿嶄綔鏃堕棿',
+ sortable: true
+ },
+ {
+ field: 'costTime',
+ title: '娑堣�楁椂闂�',
+ sortable: true,
+ formatter: function (value, row, index) {
+ return $.common.sprintf("%s姣", value);
+ }
+ },
+ {
+ title: '鎿嶄綔',
+ align: 'center',
+ formatter: function (value, row, index) {
+ var actions = [];
+ actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.operId + '\')"><i class="fa fa-search"></i>璇︾粏</a>');
+ return actions.join('');
+ }
+ }]
+ };
+ $.table.init(options);
+ });
+
+ function queryParams(params) {
+ var search = $.table.queryParams(params);
+ search.params = {
+ beginTime: beginOfTime($("#startTime").val()),
+ endTime: endOfTime($("#endTime").val())
+ };
+ search.businessTypes = $.common.join($('#businessTypes').selectpicker('val'));
+ return search;
+ }
+
+ function searchPre() {
+ $.table.search('operlog-form', 'bootstrap-table');
+ }
+
+ function resetPre() {
+ resetDate();
+ $("#operlog-form")[0].reset();
+ $("#businessTypes").selectpicker('refresh');
+ $.table.search('operlog-form', 'bootstrap-table', 1);
+ }
+</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.3