操作日志

src/custom/restcontroller/webmanage/saletool/award/Award.java

@@ -1,5 +1,6 @@
 package restcontroller.webmanage.saletool.award;
 
+import beans.datacontrllog.DataContrlLog;
 import beans.time.Time;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -38,6 +39,7 @@ public class Award extends Controller {
             insertSQL.setValue("enddate", content.getStringValue("enddate", false, "null"));
             insertSQL.insert();
             content.put("sa_awardid", sa_awardid);
+            DataContrlLog.createLog(this, "sa_award", sa_awardid, "新建", "新建活动 " + content.getString("name")).insert();
         } else {
             UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sa_award");
             updateSQL.setSiteid(siteid);
@@ -46,6 +48,7 @@ public class Award extends Controller {
             updateSQL.setValue("begdate", content.getStringValue("begdate", false, "null"));
             updateSQL.setValue("enddate", content.getStringValue("enddate", false, "null"));
             updateSQL.update();
+            DataContrlLog.createLog(this, "sa_award", sa_awardid, "编辑", "编辑活动 " + content.getString("name")).insert();
         }
 
         UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sa_award");
@@ -111,6 +114,19 @@ public class Award extends Controller {
         updateSQL.setValue("onsaleby", isonsale == 0 ? "null" : username);
         updateSQL.update();
 
+        //操作记录
+        for (Object object : sa_awardids) {
+            long sa_awardid = Long.parseLong(object.toString());
+            Row row = dbConnect.runSqlQuery(0, "SELECT * from sa_award WHERE siteid='" + siteid + "' and sa_awardid=" + sa_awardid);
+
+            if (isonsale == 0) {
+                DataContrlLog.createLog(this, "sa_award", sa_awardid, "下架", "下架 " + row.getString("name")).insert();
+            } else {
+                DataContrlLog.createLog(this, "sa_award", sa_awardid, "上架", "上架 " + row.getString("name")).insert();
+            }
+        }
+
+
 
         return getSucReturnObject().toString();
     }

src/custom/restcontroller/webmanage/saletool/award/AwardItems.java

@@ -1,5 +1,6 @@
 package restcontroller.webmanage.saletool.award;
 
+import beans.datacontrllog.DataContrlLog;
 import beans.time.Time;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -44,7 +45,7 @@ public class AwardItems extends Controller {
             insertSQL.setValue("totalcount", content.getLongValue("totalcount"));
             insertSQL.setValue("sa_awardid", sa_awardid);
             insertSQL.insert();
-
+            DataContrlLog.createLog(this, "sa_award", sa_awardid, "新建", "新建奖项 " + content.getStringValue("name")).insert();
         } else {
             UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sa_awarditems");
             updateSQL.setSiteid(siteid);
@@ -58,6 +59,7 @@ public class AwardItems extends Controller {
             updateSQL.setValue("totalcount", content.getLongValue("totalcount"));
             updateSQL.setValue("sa_awardid", sa_awardid);
             updateSQL.update();
+            DataContrlLog.createLog(this, "sa_award", sa_awardid, "编辑", "编辑奖项 " + content.getStringValue("name")).insert();
         }
 
         Rows rows = dbConnect.runSqlQuery("SELECT * from sa_awarditems WHERE sa_awarditemsid=" + sa_awarditemsid + " and siteid='" + siteid + "'");
@@ -74,6 +76,16 @@ public class AwardItems extends Controller {
             return getErrReturnObject().setErrMsg("请选择要删除的数据").toString();
         }
 
+        //操作记录
+        for (Object object : sa_awarditemsids) {
+            long sa_awarditemsid = Long.parseLong(object.toString());
+            Row row = dbConnect.runSqlQuery(0, "SELECT * from sa_awarditems WHERE siteid='" + siteid + "' and sa_awarditemsid=" + sa_awarditemsid);
+
+
+            DataContrlLog.createLog(this, "sa_award", row.getLong("sa_awardid"), "删除", "删除奖项 " + row.getString("name")).insert();
+
+        }
+
 
         DeleteSQL sqlFactory = SQLFactory.createDeleteSQL(this, "sa_awarditems");
         sqlFactory.setSiteid(siteid);

src/custom/restcontroller/webmanage/saletool/courseware/courseware.java

@@ -1,5 +1,6 @@
 package restcontroller.webmanage.saletool.courseware;
 
+import beans.datacontrllog.DataContrlLog;
 import beans.datatag.DataTag;
 import beans.remind.Remind;
 import beans.time.Time;
@@ -56,7 +57,7 @@ public class courseware extends Controller {
             insertSQL.setValue("status", "新建");
             System.err.println(insertSQL.getSQL());
             insertSQL.insert();
-
+            DataContrlLog.createLog(this, "sat_courseware", sat_coursewareid, "新建", "新建课程 " + content.getString("title")).insert();
         } else {
             UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sat_courseware");
             updateSQL.setSiteid(siteid);
@@ -69,6 +70,7 @@ public class courseware extends Controller {
             updateSQL.setValue("description", content.getStringValue("description"));
             updateSQL.getSQL();
             updateSQL.update();
+            DataContrlLog.createLog(this, "sat_courseware", sat_coursewareid, "编辑", "编辑课程 " + content.getString("title")).insert();
         }
 
 
@@ -122,6 +124,19 @@ public class courseware extends Controller {
 //        }
 
 
+        //操作记录
+        for (Object object : sat_coursewareids) {
+            long sat_coursewareid = Long.parseLong(object.toString());
+            Row row = dbConnect.runSqlQuery(0, "SELECT * from sat_courseware WHERE siteid='" + siteid + "' and sat_coursewareid=" + sat_coursewareid);
+
+            if (type == 0) {
+                DataContrlLog.createLog(this, "sat_courseware", sat_coursewareid, "取消发布", "取消发布 " + row.getString("title")).insert();
+            } else {
+                DataContrlLog.createLog(this, "sat_courseware", sat_coursewareid, "发布", "发布 " + row.getString("title")).insert();
+            }
+        }
+
+
         return getSucReturnObject().toString();
     }
 

src/custom/restcontroller/webmanage/saletool/courseware/coursewaredetail.java

@@ -1,5 +1,6 @@
 package restcontroller.webmanage.saletool.courseware;
 
+import beans.datacontrllog.DataContrlLog;
 import beans.datatag.DataTag;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -49,6 +50,7 @@ public class coursewaredetail extends Controller {
             insertSQL.insert();
 
             content.put("sat_coursewaredetailid", sat_coursewaredetailid);
+            DataContrlLog.createLog(this, "sat_courseware", sat_coursewareid, "新建", "新建课件 " + content.getString("title")).insert();
         }
         if (sat_coursewaredetailid > 0) {
             UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, sat_coursewaredetail);
@@ -61,6 +63,7 @@ public class coursewaredetail extends Controller {
             updateSQL.setValue("content", content.getString("content", true));
             updateSQL.setValue("filetype", content.getStringValue("filetype"));//图片、视频、pdf
             updateSQL.update();
+            DataContrlLog.createLog(this, "sat_courseware", sat_coursewareid, "课件", "编辑课件 " + content.getString("title")).insert();
         }
 
 
@@ -82,6 +85,22 @@ public class coursewaredetail extends Controller {
         updateSQL.setWhere("sat_coursewaredetailid", sat_coursewaredetailids.toArray());
         updateSQL.update();
 
+
+
+        //操作记录
+        for (Object object : sat_coursewaredetailids) {
+            long sat_coursewaredetailid = Long.parseLong(object.toString());
+            Row row = dbConnect.runSqlQuery(0, "SELECT * from sat_coursewaredetail WHERE siteid='" + siteid + "' and sat_coursewaredetailid=" + sat_coursewaredetailid);
+
+            Long sat_coursewareid=row.getLong("sat_coursewareid");
+
+            if (type == 0) {
+                DataContrlLog.createLog(this, "sat_courseware", sat_coursewareid, "下架", "下架课件 " + row.getString("title")).insert();
+            } else {
+                DataContrlLog.createLog(this, "sat_courseware", sat_coursewareid, "上架", "上架课件 " + row.getString("title")).insert();
+            }
+        }
+
         return getSucReturnObject().toString();
     }
 
@@ -92,6 +111,7 @@ public class coursewaredetail extends Controller {
         JSONArray sat_coursewaredetailids = content.getJSONArray("sat_coursewaredetailids");
 
         for (Object obj : sat_coursewaredetailids) {
+            long sat_coursewaredetailid = Long.parseLong(obj.toString());
             Rows rows = dbConnect.runSqlQuery("SELECT * from sat_coursewaredetail WHERE sat_coursewaredetailid=" + obj + " and siteid='" + siteid + "'");
             if (rows.isEmpty()) {
                 return getErrReturnObject().setErrMsg("课件不存在").toString();
@@ -99,6 +119,8 @@ public class coursewaredetail extends Controller {
             if (!rows.get(0).getString("status").equals("下架")) {
                 return getErrReturnObject().setErrMsg("非下架状态不可删除").toString();
             }
+            Long sat_coursewareid= rows.get(0).getLong("sat_coursewareid");
+            DataContrlLog.createLog(this, "sat_courseware", sat_coursewareid, "删除", "删除课件 " + rows.get(0).getString("title")).insert();
         }
 
         DeleteSQL deleteSQL = SQLFactory.createDeleteSQL(this, "sat_coursewaredetail");

src/custom/restcontroller/webmanage/saletool/courseware/coursewaretesthead.java

@@ -1,6 +1,7 @@
 package restcontroller.webmanage.saletool.courseware;
 
 import beans.attachment.Attachment;
+import beans.datacontrllog.DataContrlLog;
 import beans.department.Department;
 import beans.salearea.SaleArea;
 import beans.time.Time;
@@ -90,6 +91,7 @@ public class coursewaretesthead extends Controller {
             insertSQL.insert();
 
             content.put("sat_courseware_testheadid", sat_courseware_testheadid);
+            DataContrlLog.createLog(this, "sat_courseware_testhead", sat_courseware_testheadid, "新建", "新建考试 " + content.getString("title")).insert();
         }
 
         if (sat_courseware_testheadid > 0) {
@@ -105,6 +107,7 @@ public class coursewaretesthead extends Controller {
                 updateSQL.setValue("testquestions", new JSONArray());
             }
             updateSQL.update();
+            DataContrlLog.createLog(this, "sat_courseware_testhead", sat_courseware_testheadid, "编辑", "编辑考试 " + content.getString("title")).insert();
         }
         if (testaddmode == 1) {////系统随机
             content.put("sat_courseware_testlibraryids", sat_courseware_testlibraryids);
@@ -202,6 +205,18 @@ public class coursewaretesthead extends Controller {
         updateSQL.setWhere("sat_courseware_testheadid", sat_courseware_testheadids.toArray());
         updateSQL.update();
 
+        //操作记录
+        for (Object object : sat_courseware_testheadids) {
+            long sat_courseware_testheadid = Long.parseLong(object.toString());
+            Row row = dbConnect.runSqlQuery(0, "SELECT * from sat_courseware_testhead WHERE siteid='" + siteid + "' and sat_courseware_testheadid=" + sat_courseware_testheadid);
+
+            if (status == 0) {
+                DataContrlLog.createLog(this, "sat_courseware_testhead", sat_courseware_testheadid, "取消发布", "取消发布 " + row.getString("title")).insert();
+            } else {
+                DataContrlLog.createLog(this, "sat_courseware_testhead", sat_courseware_testheadid, "发布", "发布 " + row.getString("title")).insert();
+            }
+        }
+
         return getSucReturnObject().toString();
     }
 
@@ -234,6 +249,16 @@ public class coursewaretesthead extends Controller {
             updateSQL.setValue("num", testquestions.size());
         }
         updateSQL.update();
+
+        for (Object object : sat_courseware_testlibraryids) {
+            long sat_courseware_testlibraryid = Long.parseLong(object.toString());
+            Row row = dbConnect.runSqlQuery(0, "SELECT * from sat_courseware_testlibrary WHERE siteid='" + siteid + "' and sat_courseware_testlibraryid=" + sat_courseware_testlibraryid);
+
+
+            DataContrlLog.createLog(this, "sat_courseware_testhead", sat_courseware_testheadid, "添加", "添加考题 " + row.getString("question")).insert();
+        }
+
+
         return detail();
     }
 
@@ -267,6 +292,12 @@ public class coursewaretesthead extends Controller {
             updateSQL.setValue("num", testquestions.size());
         }
         updateSQL.update();
+
+        for (Object object : sat_courseware_testlibraryids) {
+            long sat_courseware_testlibraryid = Long.parseLong(object.toString());
+            Row row = dbConnect.runSqlQuery(0, "SELECT * from sat_courseware_testlibrary WHERE siteid='" + siteid + "' and sat_courseware_testlibraryid=" + sat_courseware_testlibraryid);
+            DataContrlLog.createLog(this, "sat_courseware_testhead", sat_courseware_testheadid, "删除", "删除考题 " + row.getString("question")).insert();
+        }
         return detail();
     }
 

src/custom/restcontroller/webmanage/saletool/courseware/coursewaretestlibrary.java

@@ -1,7 +1,9 @@
 package restcontroller.webmanage.saletool.courseware;
 
+import beans.datacontrllog.DataContrlLog;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.huaweicloud.sdk.apig.v2.model.AddingBackendInstancesV2Request;
 import common.Controller;
 import common.YosException;
 import common.annotation.API;
@@ -43,6 +45,7 @@ public class coursewaretestlibrary extends Controller {
             insertSQL.setValue("sat_courseware_classids", sat_courseware_classids);
             insertSQL.insert();
             content.put("sat_courseware_testlibraryid", sat_courseware_testlibraryid);
+            DataContrlLog.createLog(this, "sat_courseware_testlibrary", sat_courseware_testlibraryid, "新建", "新建题目 " + content.getString("question")).insert();
         }
         if (sat_courseware_testlibraryid > 0) {
             UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, sat_courseware_testlibrary);
@@ -52,6 +55,7 @@ public class coursewaretestlibrary extends Controller {
             updateSQL.setValue("type", content.getIntValue("type", 1));
             updateSQL.setValue("sat_courseware_classids", sat_courseware_classids);
             updateSQL.update();
+            DataContrlLog.createLog(this, "sat_courseware_testlibrary", sat_courseware_testlibraryid, "课件", "编辑题目 " + content.getString("question")).insert();
         }
 
 
@@ -195,6 +199,11 @@ public class coursewaretestlibrary extends Controller {
     @API(title = "题库选项新增或更新", apiversion = R.ID20240322093702.v1.class)
     public String optionsInsertOrUpdate() throws YosException {
         Long sat_courseware_testlibraryid = content.getLongValue("sat_courseware_testlibraryid");
+        JSONArray oldoptions = new JSONArray();
+        Rows rows = dbConnect.runSqlQuery("SELECT options from sat_courseware_testlibrary WHERE sat_courseware_testlibraryid=" + sat_courseware_testlibraryid);
+        if (rows.isNotEmpty()) {
+            oldoptions = rows.get(0).getJSONArray("options");
+        }
 
         JSONArray options = new JSONArray();
         if (content.containsKey("options")) {
@@ -207,7 +216,7 @@ public class coursewaretestlibrary extends Controller {
             i++;
         }
 
-        Rows rows = dbConnect.runSqlQuery("SELECT * from sat_courseware_testlibrary WHERE sat_courseware_testlibraryid=" + sat_courseware_testlibraryid + " and siteid='" + siteid + "'");
+        rows = dbConnect.runSqlQuery("SELECT * from sat_courseware_testlibrary WHERE sat_courseware_testlibraryid=" + sat_courseware_testlibraryid + " and siteid='" + siteid + "'");
         if (rows.isEmpty()) {
             return getErrReturnObject().setErrMsg("数据不存在").toString();
         }
@@ -233,11 +242,51 @@ public class coursewaretestlibrary extends Controller {
         if (type == 1) {
             updateSQL.setValue("typemx", typemx);
         }
-        System.err.println(updateSQL.getSQL());
         updateSQL.update();
+
+//        System.err.println(options);
+//        System.err.println(oldoptions);
+
+        if (options.size() > oldoptions.size()) {
+            JSONObject jsonObject = getNewArray(options, oldoptions);
+
+            DataContrlLog.createLog(this, "sat_courseware_testlibrary", sat_courseware_testlibraryid, "新建", "新建答案 " + jsonObject.getString("content")).insert();
+        }
+        if (options.size() == oldoptions.size()) {
+            JSONObject jsonObject = getNewArray(oldoptions, options);
+            DataContrlLog.createLog(this, "sat_courseware_testlibrary", sat_courseware_testlibraryid, "编辑", "编辑答案 " + jsonObject.getString("content")).insert();
+        }
+        if (options.size() < oldoptions.size()) {
+            JSONObject jsonObject = getNewArray(oldoptions, options);
+
+            DataContrlLog.createLog(this, "sat_courseware_testlibrary", sat_courseware_testlibraryid, "删除", "删除答案 " + jsonObject.getString("content")).insert();
+        }
+
+
         return detail();
     }
 
+    public JSONObject getNewArray(JSONArray newArray, JSONArray oldArray) throws YosException {
+        JSONArray tempArr = new JSONArray();
+        for (Object o : newArray) {
+            JSONObject jsonObject = (JSONObject) o;
+            boolean isHas = false;
+            for (Object oldo : oldArray) {
+                JSONObject oldjsonObject = (JSONObject) oldo;
+                if (jsonObject.getString("option").equals(oldjsonObject.getString("option"))
+                        && jsonObject.getString("isfact").equals(oldjsonObject.getString("isfact"))
+                        && jsonObject.getJSONArray("url").equals(oldjsonObject.getJSONArray("url"))) {
+                    isHas = true;
+                }
+            }
+            if (!isHas) {
+                tempArr.add(o);
+            }
+        }
+        return (JSONObject) tempArr.get(0);
+    }
+
+
     @API(title = "关联课件列表", apiversion = R.ID20240409142002.v1.class)
     public String relatedCoursewareList() throws YosException {
 
@@ -295,6 +344,19 @@ public class coursewaretestlibrary extends Controller {
 
         JSONArray sat_courseware_testlibrarylinkids = content.getJSONArray("sat_courseware_testlibrarylinkids");
 
+        for (Object object : sat_courseware_testlibrarylinkids) {
+            long sat_courseware_testlibrarylinkid = Long.parseLong(object.toString());
+            Row row = dbConnect.runSqlQuery(0, "SELECT * from sat_courseware_testlibrarylink WHERE siteid='" + siteid + "' and sat_courseware_testlibrarylinkid=" + sat_courseware_testlibrarylinkid);
+            Long sat_courseware_testlibraryid = row.getLong("sat_courseware_testlibraryid");
+            Long sat_coursewaredetailid = row.getLong("sat_coursewaredetailid");
+
+            row = dbConnect.runSqlQuery(0, "SELECT * from sat_coursewaredetail WHERE siteid='" + siteid + "' and sat_coursewaredetailid=" + sat_coursewaredetailid);
+
+
+            DataContrlLog.createLog(this, "sat_courseware_testlibrary", sat_courseware_testlibraryid, "删除", "删除关联课件 " + row.getString("title")).insert();
+
+        }
+
         DeleteSQL deleteSQL = SQLFactory.createDeleteSQL(this, "sat_courseware_testlibrarylink");
         deleteSQL.setSiteid(siteid);
         deleteSQL.setWhere("sat_courseware_testlibrarylinkid", sat_courseware_testlibrarylinkids);
@@ -318,6 +380,9 @@ public class coursewaretestlibrary extends Controller {
             insertSQL.setValue("sat_coursewaredetailid", obj);
             insertSQL.setValue("sat_courseware_testlibraryid", sat_courseware_testlibraryid);
             sqlList.add(insertSQL.getSQL());
+
+            Row row = dbConnect.runSqlQuery(0, "SELECT * from sat_coursewaredetail WHERE siteid='" + siteid + "' and sat_coursewaredetailid=" + obj);
+            sqlList.add( DataContrlLog.createLog(this, "sat_courseware_testlibrary", sat_courseware_testlibraryid, "添加", "添加关联课件 " + row.getString("title")).getSQL());
         }
 
 

src/custom/restcontroller/webmanage/saletool/custorder/CustOrder.java

@@ -1,6 +1,7 @@
 package restcontroller.webmanage.saletool.custorder;
 
 import beans.attachment.Attachment;
+import beans.datacontrllog.DataContrlLog;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import common.Controller;
@@ -135,6 +136,7 @@ public class CustOrder extends Controller {
         updateSQL.setValue("remarks", content.getStringValue("remarks"));
         updateSQL.update();
 
+        DataContrlLog.createLog(this, "sa_custorder", sa_custorderid, "编辑", "编辑订单日志 ").insert();
         return detail();
     }
 
@@ -230,9 +232,9 @@ public class CustOrder extends Controller {
         }
 
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_custorder",
-                "sa_custorderid", "sonum",  "status",  "amount").setTableAlias("t1");
+                "sa_custorderid", "sonum", "status", "amount").setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sa_custorderitems", "t2", "t2.sa_custorderid=t1.sa_custorderid and t2.siteid=t1.siteid"
-                ,  "price", "qty","sa_fadid");
+                , "price", "qty", "sa_fadid");
         querySQL.addQueryFields("itemname", "t2.name");
 
         querySQL.setSiteid(siteid);

src/custom/restcontroller/webmanage/saletool/fad/Fad.java

@@ -2,6 +2,7 @@ package restcontroller.webmanage.saletool.fad;
 
 import beans.attachment.Attachment;
 import beans.brand.Brand;
+import beans.datacontrllog.DataContrlLog;
 import beans.itemclass.ItemClass;
 import beans.time.Time;
 import com.alibaba.excel.write.handler.RowWriteHandler;
@@ -72,6 +73,7 @@ public class Fad extends Controller {
             sqlFactory.setValue("isstop", isstop);
             sqlFactory.insert();
             content.put("sa_fadid", sa_fadid);
+            DataContrlLog.createLog(this, "sa_fad", sa_fadid, "新建", "新建单品 " + content.getString("name")).insert();
         } else {
             UpdateSQL sqlFactory = SQLFactory.createUpdateSQL(this, sa_fad);
             sqlFactory.setUniqueid(sa_fadid);
@@ -89,6 +91,7 @@ public class Fad extends Controller {
             sqlFactory.setValue("sa_fadclassids", sa_fadclassids);
             sqlFactory.setValue("isstop", isstop);
             sqlFactory.update();
+            DataContrlLog.createLog(this, "sa_fad", sa_fadid, "编辑", "编辑单品 " + content.getString("name")).insert();
         }
 
         //上下架
@@ -226,6 +229,18 @@ public class Fad extends Controller {
         updateSQL.setValue("onsaleby", isonsale == 0 ? "null" : username);
         updateSQL.update();
 
+        //操作记录
+        for (Object object : sa_fadids) {
+            long sa_fadid = Long.parseLong(object.toString());
+            Row row = dbConnect.runSqlQuery(0, "SELECT * from sa_fad WHERE siteid='" + siteid + "' and sa_fadid=" + sa_fadid);
+
+            if (isonsale == 0) {
+                DataContrlLog.createLog(this, "sa_fad", sa_fadid, "下架", "下架单品 " + row.getString("name")).insert();
+            } else {
+                DataContrlLog.createLog(this, "sa_fad", sa_fadid, "上架", "上架单品 " + row.getString("name")).insert();
+            }
+        }
+
         return getSucReturnObject().toString();
     }
 
@@ -466,6 +481,10 @@ public class Fad extends Controller {
             insertSQL.setValue("itemid", obj);
             insertSQL.setValue("sa_fadid", sa_fadid);
             sqlList.add(insertSQL.getSQL());
+
+            Row row = dbConnect.runSqlQuery(0, "SELECT * from plm_item WHERE siteid='" + siteid + "' and itemid=" + obj);
+
+            sqlList.add(DataContrlLog.createLog(this, "sa_fad", sa_fadid, "添加关联商品", "添加关联商品 " + row.getString("itemname")).getSQL());
         }
 
 
@@ -477,6 +496,17 @@ public class Fad extends Controller {
     public String deleteItem() throws YosException {
         JSONArray sa_fad_linkids = content.getJSONArray("sa_fad_linkids");
 
+        for (Object obj : sa_fad_linkids) {
+            Row row = dbConnect.runSqlQuery(0, "SELECT * from sa_fad_link WHERE siteid='" + siteid + "' and sa_fad_linkid=" + obj);
+            Long sa_fadid = row.getLong("sa_fadid");
+            Long itemid = row.getLong("itemid");
+
+            row = dbConnect.runSqlQuery(0, "SELECT * from plm_item WHERE siteid='" + siteid + "' and itemid=" + itemid);
+
+            DataContrlLog.createLog(this, "sa_fad", sa_fadid, "删除关联商品", "删除关联商品 " + row.getString("itemname")).insert();
+        }
+
+
         DeleteSQL deleteSQL = SQLFactory.createDeleteSQL(this, "sa_fad_link");
         deleteSQL.setSiteid(siteid);
         deleteSQL.setWhere("sa_fad_linkid", sa_fad_linkids);

src/custom/restcontroller/webmanage/saletool/fad/FadGoods.java

@@ -1,6 +1,7 @@
 package restcontroller.webmanage.saletool.fad;
 
 import beans.attachment.Attachment;
+import beans.datacontrllog.DataContrlLog;
 import beans.datatag.DataTag;
 import beans.time.Time;
 import com.alibaba.fastjson.JSONArray;
@@ -242,6 +243,19 @@ public class FadGoods extends Controller {
         updateSQL.setValue("onsaleby", isonsale == 0 ? "null" : username);
         updateSQL.update();
 
+
+        //操作记录
+        for (Object object : sa_fadids) {
+            long sa_fadid = Long.parseLong(object.toString());
+            Row row = dbConnect.runSqlQuery(0, "SELECT * from sa_fad WHERE siteid='" + siteid + "' and sa_fadid=" + sa_fadid);
+
+            if (isonsale == 0) {
+                DataContrlLog.createLog(this, "sa_fad", sa_fadid, "下架", "下架 " + row.getString("name")).insert();
+            } else {
+                DataContrlLog.createLog(this, "sa_fad", sa_fadid, "上架", "上架 " + row.getString("name")).insert();
+            }
+        }
+
         return getSucReturnObject().toString();
     }
 

src/custom/restcontroller/webmanage/saletool/fad/FadHelper.java

@@ -1,5 +1,6 @@
 package restcontroller.webmanage.saletool.fad;
 
+import beans.datacontrllog.DataContrlLog;
 import beans.parameter.Parameter;
 import beans.time.Time;
 import common.BaseClass;
@@ -48,6 +49,8 @@ public class FadHelper extends BaseClass {
         sqlFactory.setValue("parentid", parentid);
         sqlFactory.setValue("canadjust", controller.content.getLongValue("canadjust"));
         sqlFactory.setValue("sys_enterpriseid", controller.sys_enterpriseid);
+
+        DataContrlLog.createLog(controller, "sa_fad", sa_fadid, "新建", "新建商品 " + controller.content.getStringValue("name")).insert();
         return sqlFactory;
     }
 
@@ -72,6 +75,7 @@ public class FadHelper extends BaseClass {
         sqlFactory.setValue("sequence", controller.content.getLongValue("sequence"));
         sqlFactory.setValue("content", controller.content.getStringValue("contentstr", true));
         sqlFactory.setValue("canadjust", controller.content.getLongValue("canadjust"));
+        DataContrlLog.createLog(controller, "sa_fad", sa_fadid, "编辑", "编辑商品 " + controller.content.getStringValue("name")).insert();
         return sqlFactory;
     }
 

src/custom/restcontroller/webmanage/saletool/notice/SQL/通告状态查询.sql

@@ -1 +1 @@
-select status,title from sat_notice where sat_noticeid in $sat_noticeids$ and  siteid=$siteid$
+select * from sat_notice where sat_noticeid in $sat_noticeids$ and  siteid=$siteid$

src/custom/restcontroller/webmanage/saletool/notice/notice.java

@@ -1,5 +1,6 @@
 package restcontroller.webmanage.saletool.notice;
 
+import beans.datacontrllog.DataContrlLog;
 import beans.remind.Remind;
 import beans.user.User;
 import com.alibaba.fastjson.JSONArray;
@@ -43,6 +44,8 @@ public class notice extends Controller {
             insertSQL.setValue("content", content.getStringValue("contentstr", true));
             insertSQL.insert();
             content.put("sat_noticeid", sat_noticeid);
+
+            DataContrlLog.createLog(this, "sat_notice", sat_noticeid, "新建", "新建通告 "+content.getString("title")).insert();
         } else {
             UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, sat_notice);
             updateSQL.setSiteid(siteid);
@@ -54,7 +57,7 @@ public class notice extends Controller {
             updateSQL.setValue("content", content.getStringValue("contentstr", true));
             updateSQL.update();
 
-
+            DataContrlLog.createLog(this, "sat_notice", sat_noticeid, "编辑", "编辑通告 "+content.getString("title")).insert();
         }
         return queryNoticeMain();
     }
@@ -228,6 +231,8 @@ public class notice extends Controller {
             if (row.getString("status").equals("发布")) {
                 return getErrReturnObject().setErrMsg("【" + row.getString("title") + "】通告已发布，无法再次发布").toString();
             }
+
+            DataContrlLog.createLog(this, "sat_notice", row.getLong("sat_noticeid"), "发布", "发布通告 "+row.getString("title")).insert();
         }
 
         SQLFactory sqlFactoryupdate = new SQLFactory(this, "通告发布");
@@ -294,6 +299,7 @@ public class notice extends Controller {
             if (row.getString("status").equals("新建")) {
                 return getErrReturnObject().setErrMsg("【" + row.getString("title") + "】通告已下架，无法再次下架").toString();
             }
+            DataContrlLog.createLog(this, "sat_notice", row.getLong("sat_noticeid"), "取消发布", "取消发布通告 "+row.getString("title")).insert();
         }
 
         SQLFactory sqlFactoryupdate = new SQLFactory(this, "通告下架");

src/custom/restcontroller/webmanage/saletool/sharematerial/DesignPic.java

@@ -1,6 +1,7 @@
 package restcontroller.webmanage.saletool.sharematerial;
 
 import beans.attachment.Attachment;
+import beans.datacontrllog.DataContrlLog;
 import beans.time.Time;
 import com.alibaba.fastjson.JSONObject;
 import common.Controller;
@@ -56,6 +57,8 @@ public class DesignPic extends Controller {
 
             sqlFactory.insert();
             content.put("sat_sharematerialid", sat_sharematerialid);
+
+            DataContrlLog.createLog(this, "sat_sharematerial", sat_sharematerialid, "新建", "新建设计实景 " + content.getString("title")).insert();
         } else {
             UpdateSQL sqlFactory = SQLFactory.createUpdateSQL(this, sat_sharematerial);
             sqlFactory.setUniqueid(sat_sharematerialid);
@@ -69,6 +72,8 @@ public class DesignPic extends Controller {
             sqlFactory.setValue("renderingsclass", content.getJSONObject("renderingsclass"));
             sqlFactory.setValue("isnationwide", content.getBooleanValue("isnationwide"));
             sqlFactory.update();
+
+            DataContrlLog.createLog(this, "sat_sharematerial", sat_sharematerialid, "编辑", "编辑设计实景 " + content.getString("title")).insert();
         }
 
         if (ispublish) {

src/custom/restcontroller/webmanage/saletool/sharematerial/EquipmentResourceLibrary.java

@@ -1,6 +1,7 @@
 package restcontroller.webmanage.saletool.sharematerial;
 
 import beans.attachment.Attachment;
+import beans.datacontrllog.DataContrlLog;
 import beans.parameter.Parameter;
 import beans.remind.Remind;
 import com.alibaba.fastjson.JSONArray;
@@ -64,6 +65,7 @@ public class EquipmentResourceLibrary extends Controller {
 
             sqlFactory.insert();
             content.put("sat_sharematerialid", sat_sharematerialid);
+            DataContrlLog.createLog(this, "sat_sharematerial", sat_sharematerialid, "新建", "新建资料 " + content.getString("title")).insert();
         } else {
             UpdateSQL sqlFactory = SQLFactory.createUpdateSQL(this, sat_sharematerial);
             sqlFactory.setUniqueid(sat_sharematerialid);
@@ -79,8 +81,8 @@ public class EquipmentResourceLibrary extends Controller {
             sqlFactory.setValue("candownload", content.getBooleanValue("candownload"));
             sqlFactory.setValue("candownload_c", content.getBooleanValue("candownload_c"));
             sqlFactory.setValue("ispicture", content.getBooleanValue("ispicture"));
-
             sqlFactory.update();
+            DataContrlLog.createLog(this, "sat_sharematerial", sat_sharematerialid, "编辑", "编辑资料 " + content.getString("title")).insert();
         }
         return detail();
     }
@@ -163,7 +165,7 @@ public class EquipmentResourceLibrary extends Controller {
 
         detailRow.put("attinfos_pic", attachmentRows);
 
-        SharematerialHelper.updateReadLog(this,sat_sharematerialid,0);
+        SharematerialHelper.updateReadLog(this, sat_sharematerialid, 0);
 
 
         return getSucReturnObject().setData(detailRow).toString();
@@ -282,6 +284,48 @@ public class EquipmentResourceLibrary extends Controller {
         Long linksid = content.getLongValue("linksid");
         String ownertable = content.getStringValue("ownertable");
         Long ownerid = content.getLongValue("ownerid");
+        String title = "";
+        String classStr = "";
+        String typeStr = "";
+        if (ownertable.equals("sat_sharematerial")) {
+            Row row = dbConnect.runSqlQuery(0, "SELECT * from sat_sharematerial WHERE siteid='" + siteid + "' and sat_sharematerialid=" + ownerid);
+            title = row.getString("title");
+            int classid = row.getInteger("classid");
+            if (classid == 2) {
+                classStr = "长图文";
+            }
+            if (classid == 3) {
+                classStr = "资料";
+            }
+            if (classid == 4) {
+                classStr = "效果图";
+            }
+            if (classid == 5) {
+                classStr = "设计实景";
+                typeStr = "视频图";
+            }
+            int type = row.getInteger("type");
+            if (type == 1) {
+                typeStr = "图片";
+            }
+            if (type == 2) {
+                typeStr = "视频";
+            }
+        }
+        if (ownertable.equals("sa_fad")) {
+            Row row = dbConnect.runSqlQuery(0, "SELECT * from sa_fad WHERE siteid='" + siteid + "' and sa_fadid=" + ownerid);
+            title = row.getString("name");
+            int classid = row.getInteger("classid");
+            if (classid == 1) {
+                classStr = "单品";
+                typeStr = "";
+            }
+            if (classid == 2) {
+                classStr = "商品";
+                typeStr = "图片";
+            }
+
+        }
 
         if (linksid <= 0) {
             linksid = createTableID("sys_attachment_links");
@@ -295,6 +339,7 @@ public class EquipmentResourceLibrary extends Controller {
             insertSQL.setValue("ownertable", ownertable);
             insertSQL.setValue("ownerid", ownerid);
             insertSQL.insert();
+            DataContrlLog.createLog(this, ownertable, ownerid, "新建", "新建" + typeStr + "于" + classStr + " " + title).insert();
         }
         if (linksid > 0) {
             UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sys_attachment_links");
@@ -304,6 +349,7 @@ public class EquipmentResourceLibrary extends Controller {
             updateSQL.setValue("sequence", content.getLongValue("sequence"));
             updateSQL.setValue("attachmentid", content.getLongValue("attachmentid"));
             updateSQL.update();
+            DataContrlLog.createLog(this, ownertable, ownerid, "编辑", "编辑" + typeStr + "于" + classStr + " " + title).insert();
         }
 
         String sql = "SELECT * from sys_attachment_links WHERE linksid=" + linksid + " and siteid='" + siteid + "'";
@@ -348,6 +394,55 @@ public class EquipmentResourceLibrary extends Controller {
     public String attachmentDelete() throws YosException {
 
         JSONArray linksids = content.getJSONArray("linksids");
+        for (Object object : linksids) {
+
+            Row row = dbConnect.runSqlQuery(0, "select * from sys_attachment_links where linksid=" + object);
+            String ownertable = row.getString("ownertable");
+            Long ownerid = row.getLong("ownerid");
+            String classStr = "";
+            String typeStr = "";
+            if (ownertable.equals("sat_sharematerial")) {
+                row = dbConnect.runSqlQuery(0, "SELECT * from sat_sharematerial WHERE siteid='" + siteid + "' and sat_sharematerialid=" + ownerid);
+
+                int classid = row.getInteger("classid");
+                if (classid == 2) {
+                    classStr = "长图文";
+                }
+                if (classid == 3) {
+                    classStr = "资料";
+                }
+                if (classid == 4) {
+                    classStr = "效果图";
+                }
+                if (classid == 5) {
+                    classStr = "设计实景";
+                    typeStr = "视频图";
+                }
+                int type = row.getInteger("type");
+                if (type == 1) {
+                    typeStr = "图片";
+                }
+                if (type == 2) {
+                    typeStr = "视频";
+                }
+                DataContrlLog.createLog(this, ownertable, ownerid, "删除", "删除" + typeStr + "于" + classStr + " " + row.getString("name")).insert();
+            }
+            if (ownertable.equals("sa_fad")) {
+                row = dbConnect.runSqlQuery(0, "SELECT * from sa_fad WHERE siteid='" + siteid + "' and sa_fadid=" + ownerid);
+                int classid = row.getInteger("classid");
+                if (classid == 1) {
+                    classStr = "单品";
+                    typeStr = "";
+                }
+                if (classid == 2) {
+                    classStr = "商品";
+                    typeStr = "图片";
+                }
+            }
+
+            DataContrlLog.createLog(this, ownertable, ownerid, "删除", "删除" + typeStr + "于" + classStr + " " + row.getString("name")).insert();
+        }
+
         DeleteSQL deleteSQL = SQLFactory.createDeleteSQL(this, "sys_attachment_links");
         deleteSQL.setSiteid(siteid);
         deleteSQL.setWhere("linksid", linksids);
@@ -431,7 +526,7 @@ public class EquipmentResourceLibrary extends Controller {
         remind.setContent(emailContent);
         remind.sendByMail();
 
-        SharematerialHelper.updateReadLog(this,sat_sharematerialid,2);
+        SharematerialHelper.updateReadLog(this, sat_sharematerialid, 2);
 
         return getSucReturnObject().toString();
     }

src/custom/restcontroller/webmanage/saletool/sharematerial/LongPicText.java

@@ -1,6 +1,7 @@
 package restcontroller.webmanage.saletool.sharematerial;
 
 import beans.attachment.Attachment;
+import beans.datacontrllog.DataContrlLog;
 import beans.time.Time;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -53,6 +54,7 @@ public class LongPicText extends Controller {
             insertSQL.setValue("content", content.getStringValue("contentstr"));
             insertSQL.insert();
             content.put("sat_sharematerialid", sat_sharematerialid);
+            DataContrlLog.createLog(this, "sat_sharematerial", sat_sharematerialid, "新建", "新建长图文 " + content.getString("title")).insert();
         } else {
 
 
@@ -65,6 +67,7 @@ public class LongPicText extends Controller {
             updateSQL.setValue("sharepagecontrol", jsonObject);
             updateSQL.setValue("content", content.getStringValue("contentstr"));
             updateSQL.update();
+            DataContrlLog.createLog(this, "sat_sharematerial", sat_sharematerialid, "编辑", "编辑长图文 " + content.getString("title")).insert();
         }
 
 
@@ -97,8 +100,8 @@ public class LongPicText extends Controller {
         Rows attRows = getAttachmentUrl("sat_sharematerial", sat_sharematerialid);
         detailRow.put("attinfos", attRows);
 
-        detailRow.put("shareurl", userInfo.getWechatAppPage("marketingtool","LongPicShareUrl") + sat_sharematerialid);
-        detailRow.put("noshareurl", userInfo.getWechatAppPage("marketingtool","LongPicNoShareUrl") + sat_sharematerialid);
+        detailRow.put("shareurl", userInfo.getWechatAppPage("marketingtool", "LongPicShareUrl") + sat_sharematerialid);
+        detailRow.put("noshareurl", userInfo.getWechatAppPage("marketingtool", "LongPicNoShareUrl") + sat_sharematerialid);
 
 
         return getSucReturnObject().setData(detailRow).toString();
@@ -119,6 +122,32 @@ public class LongPicText extends Controller {
         updateSQL.setValue("checkby", status == 0 ? "null" : username);
         updateSQL.update();
 
+        //操作记录
+        for (Object object : sat_sharematerialids) {
+            long sat_sharematerialid = Long.parseLong(object.toString());
+            Row row = dbConnect.runSqlQuery(0, "SELECT * from sat_sharematerial WHERE siteid='" + siteid + "' and sat_sharematerialid=" + sat_sharematerialid);
+            int classid = row.getInteger("classid");
+            String classStr = "";
+            if (classid == 2) {
+                classStr = "长图文";
+            }
+            if (classid == 3) {
+                classStr = "资料";
+            }
+            if (classid == 4) {
+                classStr = "效果图";
+            }
+            if (classid == 5) {
+                classStr = "设计实景";
+            }
+            if (status == 0) {
+                DataContrlLog.createLog(this, "sat_sharematerial", sat_sharematerialid, "取消发布", "取消发布" + classStr + " " + row.getString("title")).insert();
+            } else {
+                DataContrlLog.createLog(this, "sat_sharematerial", sat_sharematerialid, "发布", "发布" + classStr + " " + row.getString("title")).insert();
+            }
+        }
+
+
         return getSucReturnObject().toString();
     }
 
@@ -192,8 +221,8 @@ public class LongPicText extends Controller {
             Rows attRows = getAttachmentUrl("sat_sharematerial", row.getLong("sat_sharematerialid"));
             row.put("attinfos", attRows);
 
-            row.put("shareurl", userInfo.getWechatAppPage("marketingtool","LongPicShareUrl") + row.getLong("sat_sharematerialid"));
-            row.put("noshareurl", userInfo.getWechatAppPage("marketingtool","LongPicNoShareUrl") + row.getLong("sat_sharematerialid"));
+            row.put("shareurl", userInfo.getWechatAppPage("marketingtool", "LongPicShareUrl") + row.getLong("sat_sharematerialid"));
+            row.put("noshareurl", userInfo.getWechatAppPage("marketingtool", "LongPicNoShareUrl") + row.getLong("sat_sharematerialid"));
         }
 
 
@@ -219,7 +248,6 @@ public class LongPicText extends Controller {
         }
 
 
-
         QuerySQL attachmentQuery = SQLFactory.createQuerySQL(this, "sys_attachment_links").setTableAlias("t1");
         attachmentQuery.setSiteid(detailRow.getString("siteid"));
         attachmentQuery.setWhere("ownertable", ownertable);
@@ -227,7 +255,7 @@ public class LongPicText extends Controller {
         attachmentQuery.setWhere("usetype", ownertable);
         if (detailRow.getString("title").equals("6C红人服务")) {
             Long sys_enterpriseid = content.getLongValue("sys_enterpriseid");
-            attachmentQuery.setWhere("t1.attachmentid in(SELECT attachmentid from sys_attachment_links WHERE isonsale=1 and siteid='"+siteid+"' and  ownerid='"+sys_enterpriseid+"' and ownertable ='sys_enterpriseid' and usetype='sys_enterprise')");
+            attachmentQuery.setWhere("t1.attachmentid in(SELECT attachmentid from sys_attachment_links WHERE isonsale=1 and siteid='" + siteid + "' and  ownerid='" + sys_enterpriseid + "' and ownertable ='sys_enterpriseid' and usetype='sys_enterprise')");
         }
         attachmentQuery.setOrderBy("t1.sequence");
         Rows attachmentRows = attachmentQuery.query();
@@ -400,7 +428,7 @@ public class LongPicText extends Controller {
             Rows attRows = new Rows();
             Rows tempAttRows = attRowsMap.getOrDefault(row.getString("attachmentid"), new Rows());
             for (Row tempAttRow : tempAttRows) {
-                if (tempAttRow.getString("usetype").equals("sys_enterprise")&&tempAttRow.getLong("ownerid")==sys_enterpriseid) {
+                if (tempAttRow.getString("usetype").equals("sys_enterprise") && tempAttRow.getLong("ownerid") == sys_enterpriseid) {
                     attRows.add(tempAttRow);
                 }
             }
@@ -449,7 +477,7 @@ public class LongPicText extends Controller {
             insertSQL.setWhere("not exists(select 1 from  sys_attachment_links where attachmentid=" + row.getLong("attachmentid") + " and ownertable='sys_enterprise' and siteid='" + siteid + "' and ownerid=" + sys_enterpriseid + " )");
             insertSQL.insert();
         }
-        if(rows.isNotEmpty()) {
+        if (rows.isNotEmpty()) {
             DeleteSQL deleteSQL = SQLFactory.createDeleteSQL(this, "sys_attachment_links");
             deleteSQL.setSiteid(siteid);
             deleteSQL.setWhere("ownertable", "sys_enterprise");

src/custom/restcontroller/webmanage/saletool/sharematerial/Renderings.java

@@ -1,6 +1,7 @@
 package restcontroller.webmanage.saletool.sharematerial;
 
 import beans.attachment.Attachment;
+import beans.datacontrllog.DataContrlLog;
 import beans.itemclass.ItemClass;
 import beans.parameter.Parameter;
 import com.alibaba.fastjson.JSONArray;
@@ -56,6 +57,8 @@ public class Renderings extends Controller {
 
             sqlFactory.insert();
             content.put("sat_sharematerialid", sat_sharematerialid);
+
+            DataContrlLog.createLog(this, "sat_sharematerial", sat_sharematerialid, "新建", "新建效果图 " + content.getStringValue("title")).insert();
         } else {
             UpdateSQL sqlFactory = SQLFactory.createUpdateSQL(this, sat_sharematerial);
             sqlFactory.setUniqueid(sat_sharematerialid);
@@ -71,6 +74,7 @@ public class Renderings extends Controller {
             sqlFactory.setValue("sequence", content.getLongValue("sequence"));
             sqlFactory.setValue("readcount_start", content.getLongValue("readcount_start"));
             sqlFactory.update();
+            DataContrlLog.createLog(this, "sat_sharematerial", sat_sharematerialid, "编辑", "编辑效果图 " + content.getStringValue("title")).insert();
         }
 
         Row row = new Row();