Skip to content

H
haoban-manage3.0
Commit cefe8e46 by 徐高华
Options

朋友圈

parent 7661d54b
Showing with 509 additions and 3 deletions
haoban-manage3-service/src/test/java/QwOpenTest.java
...@@ -1030,6 +1030,425 @@ public class QwOpenTest { ...@@ -1030,6 +1030,425 @@ public class QwOpenTest {
"ff8080817a3ea213017a46ca92105d4b", "ff8080817a3ea213017a46ca92105d4b",
"ff8080818004a59201801736c0db0ecc", "ff8080818004a59201801736c0db0ecc",
"ff8080818070b5450180a30790d718a4", "ff8080818070b5450180a30790d718a4",
"ff80808174d54fce0174f7cd9000761c") ; "ff80808174d54fce0174f7cd9000761c",
"ff80808179abb1bb0179c5faebb551e3",
"ff8080817b7ddffb017b8c233a1b3944",
"ff80808174d552010174e81d2e151efd",
"ff808081776d923401777b3491ee169f",
"ff808081776d92340177c43dc9a521bc",
"ff8080817749afc201776818f6963fab",
"ff8080817550daa801759893fcc67c24",
"ff8080818070b5450180abe40e8c1772",
"ff80808179abb3200179b2c76fcd281f",
"ff8080815af15125015af3ef0f090c2e",
"ff80808175321563017549339452264b",
"ff80808174d552960174f8675dbc2277",
"ff808081776d93520177aa4e997a6d5c",
"ff8080817550dcd80175880330602f9b",
"ff808081776d946e0177a0ca61c22bd1",
"ff8080817fc19cd0017fcfe21058681e",
"ff8080817f48cb75017f4fa1964b5f4e",
"ff80808174c168f00174c3ba8a210fdb",
"ff80808179194dc001794686f36c5762",
"ff808081776d946e0177807ec8fb6873",
"ff80808175bd05a70175bfacf402729d",
"ff80808179f15b7f017a279a71430466",
"ff80808174d54f3c0174e22e61cb345d",
"ff8080817666fa2201766fb6827f74ad",
"ff8080817f50ff14017f817360376652",
"ff808081776d950201779b96944b62db",
"ff80808179abb09a0179bb58816c1a69",
"ff80808177f89eed01782fa1a67d7026",
"ff808081772589a5017732db6775265b",
"ff8080817550dc4b0175559669db0a18",
"ff8080816f9fa668016fa921454d5e6c",
"ff8080817550db2b01755fe2d8012b81",
"ff8080817bd06555017bd8d99cc03335",
"ff80808164d201980164e96f7e0b3c46",
"ff80808177f382eb0177f82f55f5143e",
"ff80808179f15e480179f9c3a8852711",
"ff8080818148fbe4018152978d8135e2",
"ff8080817fe0829c017fe93c2bf55ecc",
"ff8080816c2eed0b016c41f2729d6323",
"ff80808174d54f3c01751cba9c3d114d",
"ff8080818004a7cc018018235d101577",
"ff80808177f89b9401781c33b2ba7633",
"ff8080817966492f017978a6f92f4258",
"ff80808176cea4010176eba9235e14bb",
"ff8080817550d98201755fc6e86c73a6",
"ff8080817550dc4b017554ed2ea06e96",
"ff80808174d550e50174fbfdc61d289e",
"ff808081679dcee00167a1f346694852",
"ff8080817a3eb73d017a524b8a091756",
"ff808081776d93520177aa1aae5e2119",
"ff8080818004a73f018018c036563a7d",
"ff80808174d552960174ecdca90f604b",
"ff8080818070b78b018078ee678709a7",
"ff80808174d550e50174fdf4196169c4",
"ff80808174d550570174f74b19d11829",
"ff80808174d55296017520618adb3557",
"ff8080817550d98201755eeb9e0632f7",
"ff8080816bae6376016bb701ba916501",
"ff8080817fc199fc017fc5784fb352a1",
"ff8080816307cc3101631bdddcb6524b",
"ff808081804cb0d8018055a1948773ae",
"ff80808178f4ebce0179024119b0146d",
"ff8080817f510024017f8bd54a5753af",
"ff8080817fe0834a017ff35b597b4ac2",
"ff80808174d54fce0174e91474342a15",
"ff80808174d54fce0174e38438746d8a",
"ff80808179f15c9e017a1d4d50405aa6",
"ff80808176cea4010176e5a60b2f7e1c",
"ff8080815af40872015af4415e192418",
"ff8080818070b81e0180987ad53b6256",
"ff80808179f15ed5017a13934dee6cd9",
"ff80808174d54f3c0174f8324b612e32",
"ff80808180bdf2060180eb3033af0421",
"ff80808176af025a0176bd05ade70371",
"ff80808174d552010174e2ab59da5833",
"ff8080817749af350177676c6e752cfa",
"ff80808185973c6101859a60e9d073a2",
"ff80808185b5e0850185cd9dae1e60b8",
"ff80808186a2a3380186a6da0172575f",
"ff8080818756eef7018759d180417bf3",
"ff808081879777be01879d5edf791eff",
"ff80808187b39e520187b73f058e17e2",
"ff80808187ec3ad50187f8fbcd920576",
"ff80808176cea48f0176dba9b261489e",
"ff8080817c0e11ee017c17a3c1f73cba",
"ff80808177f89b94017816f55eb32b25",
"ff8080817b7ddffb017bc5f2eadd574a",
"ff8080817c22bdd5017c2b028b552c02",
"ff8080817b7dde5b017bc500d6054029",
"ff8080816b4c5472016b53e9b7ea0ee6",
"ff8080817261843e0172692cd3a221b3",
"ff808081737c47990173a990a4c27d08",
"ff808081776d92340177d6c057803d90",
"ff8080817c0e1314017c178cb8130b3f",
"ff8080817bd06672017bd8cd73621ada",
"ff808081776d92340177cccfabbc19d5",
"ff8080817b5f12c8017b6386a26a3e3a",
"ff808081769544660176ae5901c60796",
"ff8080815ea01eb5015ed2afa47f7602",
"ff80808179f15e48017a1d01abe2485c",
"ff8080817c0e127e017c0e8d16f65d76",
"ff8080817c0e1314017c17c8812c762d",
"ff8080817b7dde5b017bb09231185841",
"ff8080817599856e0175a5d6b31e0338",
"ff8080817cd9af75017cefe2f36d16fe",
"ff8080817b7dded5017bc8c110d624b6",
"ff8080817c0e104b017c175b581b3bd2",
"ff8080817b7dded5017b8d0f82517c64",
"ff8080816f42e508016f60ecd92b16c3",
"ff8080817b7de123017b85cc2e247d96",
"ff8080817ee42b0c017f06821d8232db",
"ff8080817aaac0b8017ac39c1f3d510e",
"ff8080817c608029017c78704d015d79",
"ff8080816dac1705016dbdc1e6fa2dd1",
"ff8080815c1bf88a015c1ec33a420f1c",
"ff8080817cc94183017cd06b9e200d21",
"ff8080816dd01609016de90f42127be5",
"ff8080817c7f7639017c8d23275367bd",
"ff8080817b11bb40017b1eb03ca77979",
"ff8080817b5f0f7a017b6369dd660567",
"ff8080817b11bb40017b486112c97c19",
"ff8080817b5f123c017b6374fd1c2176",
"ff8080815e5ce302015e60740d995e85",
"ff808081776d946e01777696d49c41a9",
"ff8080818070b78b0180b37e3b8b5da0",
"ff8080817c22bcc3017c2c62c7556e1e",
"ff8080817c7f75b0017ca62d195f2a2c",
"ff8080817599856e01759d839ee030be",
"ff8080816e18c6c3016e2b24ab942252",
"ff8080817b11ba21017b5250e6990e24",
"ff8080817d053c6e017d1905ce5d08fd",
"ff8080817b7de123017baffbaaba42ae",
"ff8080816e18c84b016e3a931d9d67dd",
"ff8080817c0e10db017c2089682530ac",
"ff8080817c7f7639017ca7edadea4e8c",
"ff8080817cd9b13e017cfa879ca5560f",
"ff808081695b26da0169623caab76dae",
"ff8080817b7ddffb017b9b1b74f446a0",
"ff8080817c0e104b017c175e385542c3",
"ff8080816e6559ca016e7353ae8d3370",
"ff8080817c0e13a0017c1772f6865415",
"ff8080817b7de092017b9c661e561ae4",
"ff808081736277e801736f48b5f740e9",
"ff8080817b5f108d017b6378013b2d2d",
"ff80808177258a330177437301461fc7",
"ff8080817cd9af08017cfa5b53f04353",
"ff8080817bf46677017bf7fd1f4419ea",
"ff8080817aaac02b017ac45fd99665f9",
"ff8080817c2cf2e9017c3a42abdb4edb",
"ff8080817b5f1011017b68a485fb07b3",
"ff8080816f42e25c016f78d967d45ced",
"ff80808173720d0201737ae329ae2ce5",
"ff80808188d8f7c40188ed1f51f87748",
"ff808081894f909a01895b6980465ce0",
"ff80808189feacc7018a03c6425e4437",
"ff8080817213caf501722d02166703cf",
"ff8080817fc199fc017fc8e4f7c2216e",
"ff8080817550daa801755ffb78d447eb",
"ff8080818abd75c5018ac67f840140fc",
"ff8080818ad1d84f018ae591b1bb7197",
"ff8080818ad1d404018af560e16b69de",
"ff8080815c8c167e015c8c5ecaa50eda",
"ff80808183469c230183550606d913bc",
"ff80808186e5d9000186e6609332410c",
"ff8080818bb46c6b018bc88b8d1731ee",
"ff8080816d26e3bb016d2f3002ab2658",
"ff8080817fc199fc017fc44339df4e5b",
"ff80808176cea3790176e1586b1f0ae2",
"ff808081771992e101771ed08b2172fd",
"ff8080817550da1801755466ca621fb3",
"ff8080817e28b0a2017e296ad0c1483e",
"ff8080816bc34996016bc5fb3e683dc9",
"ff808081796649b901796afbd6a45c13",
"ff80808179f15d26017a322357e470b0",
"ff80808179f15b7f017a32a008587893",
"ff80808180bdf3240180e5b4829e64e8",
"ff8080817550dbbd01755eb30a48309e",
"ff80808179abb12e0179ac8bf07928c2",
"ff80808181fd33aa018215dc5db824e9",
"ff8080817164beae01717311f9a65ce3",
"ff80808175bd07d30175cb4d1d360ce2",
"ff8080817ee429e9017f06b3f4f40957",
"ff8080817cc78955017cd5c5a0bc76f2",
"ff8080817e49c6cd017e575fdb85718f",
"ff8080817a3eb73d017a522fc90c5102",
"ff8080817bf46433017c073f088a2fe3",
"ff808081762e55e801763767cc164f71",
"ff8080817ee427b5017f070bee5d626d",
"ff80808179f15ed5017a096c31600d52",
"ff80808174d54f3c0174e3fe94765599",
"ff80808179abb1bb0179b817b32626e3",
"ff8080817e78b629017e81b8dded2889",
"ff8080817a3ea06c017a5236b22a7a10",
"ff808081737c45f60173945839450897",
"ff8080817a3e9f5a017a4791f20f2aa2",
"ff8080817966481301798959d12735c7",
"ff80808180b496110180b7195da320c8",
"ff8080817aaac159017abd4d3c32134e",
"ff808081771993f401771e97d5c01a6a",
"ff8080817d053d90017d0e3e432a2a14",
"ff80808176714b10017675a8b0e43970",
"ff8080817fd10f30017fd51adc8a0f89",
"ff8080817a62a5b8017a666e879b61a0",
"ff8080817599845401759d3a76901722",
"ff8080817b5f12c8017b6885fb0d4dc3",
"ff80808174d551700174fc7fe1df1871",
"ff8080817642e49001766603e2ce708d",
"ff8080817642e6bc01765af4d21470e4",
"ff80808175bd062f0175c09c1ccb71d4",
"ff8080818168473c01816fdda30e642e",
"ff8080817550da1801757dd056752ef8",
"ff8080817599834401759d34633505f8",
"ff80808179664813017992ca3642461e",
"ff8080815af408b9015af45818963ed5",
"ff80808174d552010174e3f91e572752",
"ff8080817749acfa01776c22f83145bd",
"ff8080817e8ca55a017ea5201de11c6d",
"ff80808176d515c80176eb51b9f251c5",
"ff80808174d551700174f23c663d6e1d",
"ff808081776d9502017775769cf60a97",
"ff808081762e56700176424712765ad5",
"ff808081762e55e8017637dca6b0451d",
"ff808081605b47c901605eb808db2a50",
"ff8080817e8ca706017e90b52abf50f1",
"ff8080817aaac0b8017abd4e1c790730",
"ff80808175bd062f0175cb4a1fae112f",
"ff8080817b11bbd1017b24132a8b2601",
"ff8080817c0e11ee017c171464a10cae",
"ff80808174d54fce0174e3f8fa8a3308",
"ff80808179664ad5017992b6134003d9",
"ff8080817749b05801774cf3319820d3",
"ff8080817966492f01799e96d0790646",
"ff8080817b5f0f7a017b688872d3434b",
"ff8080817d483a4b017d4c9eb70e3ca4",
"ff8080815af40872015af4415e192418",
"ff8080817b5f0f7a017b688766f241a6",
"ff8080817f2c7208017f3035a55c538e",
"ff8080817666f99a01766ba1b03e43c1",
"ff80808176cea48f0176ec4345e811c9",
"ff80808176cea25e0176eb50cb6d4052",
"ff8080815fca9737015fd37982ae4546",
"ff8080817fd10d86017fd9ad05082d86",
"ff8080817e139eb7017e1a5fe19f144f",
"ff8080817d4d5611017d5bcb072b2030",
"ff8080816ea93e53016ebbab1e8139a8",
"ff8080817550da18017588b53d674309",
"ff80808176af013a0176c779603c02a6",
"ff8080815b9666c5015b9e0a621f4fc6",
"ff80808176cea51c01770f857399549f",
"ff8080817695472c01769def58513b84",
"ff80808174d54f3c017502a770ba4a1f",
"ff80808179476e2201795aaee461383c",
"ff8080817550d982017558ee6304291c",
"ff8080817cd9af75017cf98830cb4539",
"ff80808179abb1bb0179c694d21a5a1c",
"ff80808174d5505701750d4187a702b4",
"ff8080818070b81e0180a7d8cb5c581e",
"ff80808174d54f3c0175267b225e0964",
"ff8080817d483bfe017d4c5ae343575f",
"ff80808176cea4010176f5a725df1091",
"ff8080817a86a998017a9408528d69ce",
"ff8080817bf4631e017c032eef01502a",
"ff8080817fad1bd7017fb6c4b6321547",
"ff80808179f15ed5017a096380ea72cb",
"ff8080817aaabe86017abd51377b2941",
"ff8080816b7837b8016b88098ccc64d3",
"ff8080817f510255017f868b6fbc753b",
"ff8080817b5f111d017b688a98a5443d",
"ff80808179f15c9e017a2379142b54d4",
"ff80808176af025a0176c7807356153d",
"ff80808179abb09a0179c79ca3934207",
"ff8080817599856e01759d35f2690e8a",
"ff80808179f15e48017a28146b6b6eb8",
"ff80808174d552960174fd9379407fd5",
"ff80808176954581017698dcbd2d73ab",
"ff80808179f15c1a017a3dea3d0b4cac",
"ff808081796648a801797417b2b31a62",
"ff8080817550dbbd01755f7e30777179",
"ff80808179f15b7f0179fe7c748c5c68",
"ff80808174c168f00174d3e89b777abd",
"ff8080817550dcd801755466a4a41f5c",
"ff808081804cb0d8018050fab6c919b0",
"ff80808176cea51c01770a02520c5d2e",
"ff80808161f9d52e0161fad0338a3db7",
"ff8080815cc12e8a015cc8df18680878",
"ff8080817aaabe86017ab76ed65d1c96",
"ff80808183c795410183ca7571477a5b",
"ff80808179f15d26017a096975682876",
"ff80808179abb1bb0179c79e50e33749",
"ff808081796648a801799ce8fd822c36",
"ff80808176cea3790176f5a6ef6b32e2",
"ff8080817e139eb7017e1a5f625c12eb",
"ff8080817ee42a81017f1535e0aa063f",
"ff8080817aaabe86017ae7467dfa1786",
"ff80808181fd37440182100809e5040f",
"ff80808176cea51c0176d7be8d7c1e9f",
"ff8080818168473c0181759759dd2674",
"ff8080817ee427b5017f16f4982d7618",
"ff80808171f4dd120171fdafb40e4503",
"ff80808179664ad501799cc5a9d0194f",
"ff80808174d55201017520cdc4923de7",
"ff8080817e35198b017e3d983ae9233c",
"ff8080817f51013d017f7e19e65c408e",
"ff8080817b7de123017b9b9a5f8b10ba",
"ff808081894f91e5018957efe211237d",
"ff8080817c7f740b017cb05f6e961b11",
"ff80808186eac21e0186fdf0c06c3c1d",
"ff8080817d053d90017d168f56c71b19",
"ff8080818c208d66018c2a7d946513bb",
"ff8080818c68a2fe018c77d0d68e293f",
"ff80808187c8ff0e0187cd1e7fec19f0",
"ff8080818ca674bc018cb58ad81040d9",
"ff8080818abd75c5018acb7e150e63c2",
"ff8080817f51013d017f6e997a5543eb",
"ff808081676a652f016773c7b4555147",
"ff8080818c91d932018c9ccd55d408bc",
"ff8080818cf8dcc0018d0bbc61ba3d46",
"ff8080818d1dbedf018d2b0031232c08",
"ff80808185a1a96d0185b5b41726660a",
"ff8080818d5aed1a018d6d776125787f",
"ff8080818d5aebee018d6db4c06a4dff",
"ff8080818d5aeb10018d6f0c39b80e52",
"ff8080818d5aea59018d7874478640f6",
"ff8080818d5aedc0018d7946f6546dee",
"ff8080818d79cefe018da65bf6395326",
"ff8080818d79d10a018da784182a3480",
"8a80818b8d79d060018dc00708443785",
"ff8080817671496801767f0a8c640685",
"ff8080818dcc1339018de473259a4d89",
"ff8080818df576ea018df93518ef7569",
"8a80818b8e3d4f5a018e4b6143db129b",
"ff8080818e573e0a018e5a05371e72b2",
"8a80818b8e9f2501018ea8eea2191fe4",
"ff8080818e9f265e018eb8027a6a5f15",
"ff8080818ecd7be7018ed267ac33600f",
"ff8080818eed5382018f00a0cc755473",
"ff8080816ea93e53016ee4723e784382",
"ff8080818ebe078f018ec71d034530e7",
"ff8080818f250fed018f3c8b25683ade",
"ff80808185b5e3930185f691fd8b5752",
"ff80808179194d3001793b4548913796",
"ff8080817550dbbd0175597448ed5ed4",
"ff80808174d54f3c017506ea232e6add",
"ff80808177f89b940178580f8ee47300",
"ff80808174d5505701752a27f46f69c7",
"ff80808178d615890178daa73f94254c",
"ff80808175e11f150175e59d7170094f",
"ff80808177f89dcf01780687dc0874e7",
"ff80808179abb1bb0179b2cc9cdd3b40",
"ff80808177f89b94017844ff25d260bb",
"ff80808178b211940178babc066935e3",
"ff80808177d9ccc80177e24738e43eca",
"ff80808177f89b9401781ae071aa4f72",
"ff808081786615720178a21846ab6acc",
"ff808081759985f70175ac1ddc836a4c",
"ff80808176cea48f0176e1e1190729ef",
"ff808081776d9234017785ed0665635f",
"ff80808167d68ed90167dab67cf74ab5",
"ff80808177f89eed0178111f65e40af5",
"ff8080817aaabf09017ab45331e936d8",
"ff80808179664ad50179896140d33e5b",
"ff80808177f89eed0178068b42501549",
"ff8080817a3e9ec3017a487a1a741649",
"ff80808179f15ed5017a276be2c42dc9",
"ff80808177f89cb101781b775d9124f6",
"ff80808179476d0c0179512e33782425",
"ff80808178d614710178e3ad87d93396",
"ff8080816c4dc901016c65953f701d39",
"ff808081760a4415017628ad77ff3ed7",
"ff80808175bd05160175c139a5b724cf",
"ff808081796648a801796dfbd0ba144e",
"ff808081760a44aa017627f5e74a02d1",
"ff8080817642e63401765a4b923c0a48",
"ff80808163e13a450163e39e1afc3417",
"ff808081618059ad01618f2754c54c41",
"ff8080817a62a769017a6ae164e0441a",
"ff80808179664ad501796e076b4a215b",
"ff80808179664a4701796df8a64d0049",
"ff8080818bb46da9018bcb9d8d8535a5",
"ff80808176cea25e0176e081e9343519",
"ff8080817749afc2017757c5c06c2b40",
"ff8080817550dc4b017554835d1848bf",
"ff80808178b212b30178bf3d9f9b5f72",
"ff808081796649b901797d72abcb043e",
"ff8080817a3e9f5a017a487b2fbb1817",
"ff808081796648a8017992c951552089",
"ff80808179194dc001793bf1124d03b0",
"ff808081759984540175ac101f686851",
"ff80808178d612c60178e4d34f912749",
"ff80808179664ad501796e072fda2117",
"ff8080817550da1801758c874872440a",
"ff8080817550daa8017583e432834e5e",
"ff80808179664ad501799306b5c83211",
"ff80808174d5520101751c7c2a736ce7",
"ff808081762e5703017631207d385790",
"ff8080817666f76d017669a231ea4c2d",
"ff808081772588880177382a4f366969",
"ff8080817642e74c017655ee0dbb4eba",
"ff80808178b212b30178b5d32baf532e",
"ff80808176af001f0176c71cb8cf7c87",
"ff808081762e5703017631ae387538c3",
"ff80808177258b5101772dd61e55177f",
"ff808081762e54ce01763bcb47556131",
"ff80808177258ac20177430ac1246e90",
"ff80808176cea37901770a6a14927e35",
"ff808081799ee88a0179a1ff26ff234b",
"ff8080817725891d017732bc7f236dab",
"ff8080817725891d01773d2d54ed7a30",
"ff808081762e57030176414dbea82954",
"ff80808178d616160178df3c27844c93",
"ff80808190c10b8c0190c90fe16323cb",
"ff80808190fed76701910cacfb1b6e43",
"0000000091138e920191213c543e6cef",
"ff8080819128eed701913ba5406160d2",
"ff8080819128eed701913142be6a30eb",
"ff8080819151524f01915fc221bb34b1",
"ff8080819151538f01915fc57dde76e6",
"ff8080819151508e01917deaec53298c",
"8a80818b919e8fec0191ad4a3e210867") ;
} }
} }
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/moment/QwMomentController.java
...@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; ...@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.clerk.api.dto.AuthorizedUser; import com.gic.clerk.api.dto.AuthorizedUser;
import com.gic.commons.util.DateUtil;
import com.gic.commons.util.EntityUtil; import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.PageHelperUtils; import com.gic.commons.util.PageHelperUtils;
import com.gic.commons.webapi.reponse.RestResponse; import com.gic.commons.webapi.reponse.RestResponse;
...@@ -32,6 +33,7 @@ import com.gic.log.record.util.GicLogRecordEvaluationContext; ...@@ -32,6 +33,7 @@ import com.gic.log.record.util.GicLogRecordEvaluationContext;
import com.gic.log.record.util.GicLogRecordOptTypeEnum; import com.gic.log.record.util.GicLogRecordOptTypeEnum;
import com.gic.web.common.utils.SessionContextUtils; import com.gic.web.common.utils.SessionContextUtils;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -40,6 +42,7 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -40,6 +42,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -88,18 +91,102 @@ public class QwMomentController { ...@@ -88,18 +91,102 @@ public class QwMomentController {
GicLogRecordEvaluationContext.noWriteLog(); GicLogRecordEvaluationContext.noWriteLog();
return RestResponse.failure("9999","活动id为空") ; return RestResponse.failure("9999","活动id为空") ;
} }
ServiceResponse<QwMomentPlanDTO> planResp = this.qwMomentApiService.detail(qo.getPlanId()) ;
if(null == planResp.getResult()) {
GicLogRecordEvaluationContext.noWriteLog();
return RestResponse.failure("9999","导购任务不存在") ;
}
QwMomentPlanDTO oldPlan = planResp.getResult() ;
QwMomentPlanDTO plan = EntityUtil.changeEntityByJSON(QwMomentPlanDTO.class,qo) ; QwMomentPlanDTO plan = EntityUtil.changeEntityByJSON(QwMomentPlanDTO.class,qo) ;
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser(); WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
plan.setEnterpriseId(loginUser.getEnterpriseId()); plan.setEnterpriseId(loginUser.getEnterpriseId());
plan.setWxEnterpriseId(loginUser.getWxEnterpriseId()); plan.setWxEnterpriseId(loginUser.getWxEnterpriseId());
plan.setCreatorId(loginUser.getClerkId()); plan.setCreatorId(loginUser.getClerkId());
plan.setCreatorName(loginUser.getClerkName()); plan.setCreatorName(loginUser.getClerkName());
ServiceResponse<QwMomentPlanDTO> resp = this.qwMomentApiService.save(plan) ; ServiceResponse<QwMomentPlanDTO> resp = this.qwMomentApiService.save(plan) ;
String logContent = "编辑企微朋友圈活动【" + resp.getResult().getTitle() + "-" + resp.getResult().getPlanId() + "】"; String logTitle = "编辑企微朋友圈活动【" + resp.getResult().getTitle() + "-" + resp.getResult().getPlanId() + "】";
GicLogRecordEvaluationContext.putAttribute("logValue", logContent); ServiceResponse<QwMomentPlanDTO> newPlanResp = this.qwMomentApiService.detail(qo.getPlanId()) ;
String logContent = this.getLogContent(loginUser.getEnterpriseId(), oldPlan, newPlanResp.getResult());
logger.info("日志内容logContent={}",logContent);
if(StringUtils.isBlank(logContent.trim())) {
GicLogRecordEvaluationContext.noWriteLog();
}else {
GicLogRecordEvaluationContext.putAttribute("logValue", logTitle + logContent);
}
return RestResponse.successResult(resp.getResult().getPlanId()+"") ; return RestResponse.successResult(resp.getResult().getPlanId()+"") ;
} }
private String getLogContent(String enterpriseId ,QwMomentPlanDTO oldDTO , QwMomentPlanDTO newDTO) {
List<String> logList = new ArrayList<>();
this.otherLog("活动标题",oldDTO.getTitle(),newDTO.getTitle() , logList) ;
this.otherLog("活动描述",oldDTO.getRemark(),newDTO.getRemark() , logList) ;
this.otherLog("执行方式",oldDTO.getRemark(),newDTO.getRemark() , logList) ;
this.otherLog("变更任务时间", DateUtil.dateToStr(oldDTO.getBeginDate(),"yyyy-MM-dd")+"至"+DateUtil.dateToStr(oldDTO.getEndDate(),"yyyy-MM-dd"),
DateUtil.dateToStr(newDTO.getBeginDate(),"yyyy-MM-dd")+"至"+DateUtil.dateToStr(newDTO.getEndDate(),"yyyy-MM-dd"),logList) ;
// this.otherLog2("修改了任务图片",oldDTO.getImg(),newDTO.getImg(),logList) ;
this.otherLog("任务说明",oldDTO.getRemark(),newDTO.getRemark(),logList) ;
if(!oldDTO.getMediaInfo().equals(newDTO.getMediaInfo())) {
logList.add("变更朋友圈配置");
}
if(newDTO.getPublishType()==1) {
if(oldDTO.getPublishType()==2) {
this.otherLog("发布时间", "定时发布", "立即发布", logList);
}
}else {
if(oldDTO.getPublishType()==1) {
this.otherLog("发布时间","立即发布",DateUtil.dateToStr(newDTO.getPublishTime(),"yyyy-MM-dd HH:mm"),logList) ;
}else {
this.otherLog("发布时间",DateUtil.dateToStr(oldDTO.getPublishTime(),"yyyy-MM-dd HH:mm"),DateUtil.dateToStr(oldDTO.getPublishTime(),"yyyy-MM-dd HH:mm"),logList) ;
}
}
/* // 指定人群
if(oldDTO.getTaskType()!= ClerkTaskTypeEnum.CONTENT.getType()) {
this.otherLog("指定人群",this.rqLogTitle(oldDTO.getMemberType()),this.rqLogTitle(newDTO.getMemberType()),logList) ;
}
// 召回规则订单渠道
if(oldDTO.getTaskType() == ClerkTaskTypeEnum.ORDER.getType()) {
this.otherLog("召回规则订单渠道",this.channelName(enterpriseId,oldDTO.getOrderChannels()),this.channelName(enterpriseId,newDTO.getOrderChannels()),logList) ;
}
// 添加规则
if(oldDTO.getTaskType() == ClerkTaskTypeEnum.QW.getType()) {
String s = this.otherLog("添加规则",this.qwRule(oldDTO.getQwRule()),this.qwRule(newDTO.getQwRule()),logList) ;
String s1= this.qwNotMemberFlag(oldDTO.getQwNotMemberFlag(),newDTO.getQwNotMemberFlag(),StringUtils.isBlank(s)) ;
logList.add(s1) ;
}
// 指定导购
if(oldDTO.getTaskMode() == 2) {
List<String> oldClerkIdList = oldDTO.getClerkList().stream().map(o->o.getClerkId()).collect(Collectors.toList());
List<String> newClerkIdList = newDTO.getClerkList().stream().map(o->o.getClerkId()).collect(Collectors.toList());
this.otherLog("指定导购",oldClerkIdList.size()+"个",newClerkIdList.size()+"个",logList) ;
*//*if(CollectionUtils.isNotEmpty(differenceList(oldClerkIdList,newClerkIdList)) &&
CollectionUtils.isNotEmpty(differenceList(newClerkIdList,oldClerkIdList))) {
String s1 = oldDTO.getClerkList().stream().map(o->o.getClerkName()).collect(Collectors.joining("、")) ;
String s2 = newDTO.getClerkList().stream().map(o->o.getClerkName()).collect(Collectors.joining("、")) ;
this.otherLog("指定导购",s1,s2,logList) ;
}*//*
}*/
return logList.stream().filter(o->StringUtils.isNotBlank(o)).collect(Collectors.joining(";"));
}
private String otherLog(String s1, String s2, String s3 , List<String> logList) {
if(null == s2) {
s2 = "" ;
}
if(null == s3) {
s3 = "" ;
}
if (!s2.equals(s3)) {
String s = new StringBuilder(s1).append("从【").append(s2).append("】修改为【").append(s3).append("】").toString() ;
if(null != logList) {
logList.add(s);
}
return s ;
}
return "";
}
/** /**
* 删除 * 删除
* @return * @return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment