添加应用管理配置的日志

src/main/java/com/archser/aserver/controller/SettingController.java

@@ -6,7 +6,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
 import java.util.Objects;
+import com.archser.aserver.interceptor.JwtInterceptor;
 import com.archser.aserver.model.Config;
+import com.archser.aserver.service.LogService;
 import com.archser.aserver.service.SystemService;
 import com.archser.aserver.validator.SettingValidator;
 import com.jfinal.aop.Before;
@@ -28,6 +30,9 @@ import sun.misc.BASE64Encoder;
 @SuppressWarnings("restriction")
 public class SettingController extends Controller {
 
+  @Inject
+  private LogService logService;
+
   /**
    * 通用的获取配置方法
    * 
@@ -61,7 +66,16 @@ public class SettingController extends Controller {
   public void findConfigList() {
     String searchText = this.getPara("searchText");
     List<Config> configs = systemService.findConfigList(searchText);
+    /** xiaoying 20200715 YZJ-4212 功能操作中没有应用管理的日志 start */
+    if (configs != null && configs.size() != 0) {
       this.renderJson(Ret.ok("configs", configs));
+      logService.saveAsLog("operate", getAttr("username"), JwtInterceptor.getIpAddr(getRequest()),
+          "应用管理-配置-查询数据包含：" + searchText + "的数据", "aserver");
+    } else {
+      logService.saveAsLog("operate", getAttr("username"), JwtInterceptor.getIpAddr(getRequest()),
+          "应用管理-配置-查询数据失败", "aserver");
+    }
+    /** xiaoying 20200715 YZJ-4212 功能操作中没有应用管理的日志 end */
   }
 
   /**
@@ -69,7 +83,7 @@ public class SettingController extends Controller {
    * 常用配置项
    */
   @Clear
-//	@Before(UnifiedErrorInterceptor.class)
+  // @Before(UnifiedErrorInterceptor.class)
   public void sso() {
     String val = null;
     try {
@@ -101,9 +115,10 @@ public class SettingController extends Controller {
    * 常用配置项
    */
   public void logoUrl() {
-	String filePath = PathKit.getWebRootPath() + File.separator + "logo" + File.separator + "logo.png"; 
+    String filePath =
+        PathKit.getWebRootPath() + File.separator + "logo" + File.separator + "logo.png";
     this.renderJson(Ret.ok("logoUrl", ImageToBase64(filePath)));
-}
+  }
 
   private static String ImageToBase64(String imgPath) {
     byte[] data = null;
@@ -120,17 +135,17 @@ public class SettingController extends Controller {
     BASE64Encoder encoder = new BASE64Encoder();
     // 返回Base64编码过的字节数组字符串
     return encoder.encode(Objects.requireNonNull(data));
-//	    System.out.println("本地图片转换Base64:" + encoder.encode(Objects.requireNonNull(data)));
+    // System.out.println("本地图片转换Base64:" + encoder.encode(Objects.requireNonNull(data)));
   }
-//	public void logoUrl() {
-//		String val = null;
-//		try {
-//			val = this.getConfig("logoUrl");
-//		} catch (Exception e) {
-//			this.renderJson(Ret.fail("msg", e.getMessage()));
-//		}
-//		this.renderJson(Ret.ok("logoUrl", val));
-//	}
+  // public void logoUrl() {
+  // String val = null;
+  // try {
+  // val = this.getConfig("logoUrl");
+  // } catch (Exception e) {
+  // this.renderJson(Ret.fail("msg", e.getMessage()));
+  // }
+  // this.renderJson(Ret.ok("logoUrl", val));
+  // }
 
 
   public void getServerName() {
@@ -166,15 +181,32 @@ public class SettingController extends Controller {
   @Before(Tx.class)
   public void add() {
     Config config = getModel(Config.class, "", true);
+    Boolean success = false;
     if (config == null) {
       renderJson(Ret.fail("msg", "请填写完整数据"));
     } else if (config.getId() == null || config.getId() == 0) {
       config.set("ID", Config.SEQ_NEXTVAL);
-			config.save();
+      success = config.save();
+      /** xiaoying 20200715 YZJ-4212 功能操作中没有应用管理的日志 start */
+      if (success) {
         renderJson(Ret.ok("ok", "添加成功"));
+        logService.saveAsLog("operate", getAttr("username"), JwtInterceptor.getIpAddr(getRequest()),
+            "应用管理-配置-添加配置-配置名称为-" + config.getName() + "-添加成功", "aserver");
+      } else {
+        logService.saveAsLog("operate", getAttr("username"), JwtInterceptor.getIpAddr(getRequest()),
+            "应用管理-配置-添加配置-配置名称为-" + config.getName() + "-添加失败", "aserver");
+      }
     } else if (config.getId() != 0) {
-			config.update();
+      success = config.update();
+      if (success) {
         renderJson(Ret.ok("ok", "修改成功"));
+        logService.saveAsLog("operate", getAttr("username"), JwtInterceptor.getIpAddr(getRequest()),
+            "应用管理-配置-编辑配置-配置名称为-" + config.getName() + "-修改成功", "aserver");
+      } else {
+        logService.saveAsLog("operate", getAttr("username"), JwtInterceptor.getIpAddr(getRequest()),
+            "应用管理-配置-编辑配置-配置名称为-" + config.getName() + "-修改失败", "aserver");
+      }
+      /** xiaoying 20200715 YZJ-4212 功能操作中没有应用管理的日志 end */
     }
   }
 
@@ -189,15 +221,21 @@ public class SettingController extends Controller {
       renderJson(Ret.fail("msg", "请选择数据"));
     }
     Boolean success = false;
+    StringBuilder sb = new StringBuilder();
+    /** xiaoying 20200715 YZJ-4212 功能操作中没有应用管理的日志 start */
     for (String id : idsArray) {
-			Config config = new Config();
-			config.setId(Integer.valueOf(id));
-			success = config.delete();
+      sb.append(Config.dao.findById(Integer.valueOf(id)).getName() + ",");
+      success = Config.dao.deleteById(Integer.valueOf(id));
     }
     if (success) {
       renderJson(Ret.ok());
+      logService.saveAsLog("operate", getAttr("username"), JwtInterceptor.getIpAddr(getRequest()),
+          "应用管理-配置-删除配置-配置名称为-" + sb.substring(0, sb.lastIndexOf(",")) + "-删除成功", "aserver");
     } else {
       renderJson(Ret.fail("msg", "删除数据出错"));
+      logService.saveAsLog("operate", getAttr("username"), JwtInterceptor.getIpAddr(getRequest()),
+          "应用管理-配置-删除配置-配置名称为-" + sb.substring(0, sb.lastIndexOf(",")) + "-删除失败", "aserver");
     }
+    /** xiaoying 20200715 YZJ-4212 功能操作中没有应用管理的日志 end */
   }
 }