ines-num lines-num-new"> 883 
            landmarkType = "7">
900 884 
         </BreakpointContent>
901 885 
      </BreakpointProxy>
@ -911,7 +895,7 @@
911 895 
            endingColumnNumber = "9223372036854775807"
912 896 
            startingLineNumber = "244"
913 897 
            endingLineNumber = "244"
914 
            landmarkName = "-closeIpuApp:"
898 
            landmarkName = "-reLogin:"
915 899 
            landmarkType = "7">
916 900 
         </BreakpointContent>
917 901 
      </BreakpointProxy>
@ -927,40 +911,8 @@
927 911 
            endingColumnNumber = "9223372036854775807"
928 912 
            startingLineNumber = "253"
929 913 
            endingLineNumber = "253"
930 
            landmarkName = "-initNfc:"
914 
            landmarkName = "-closeVC:toPage:"
931 915 
            landmarkType = "7">
932 
            <Locations>
933 
               <Location
934 
                  shouldBeEnabled = "Yes"
935 
                  ignoreCount = "0"
936 
                  continueAfterRunningActions = "No"
937 
                  symbolName = "-[AppManagePlugin initNfc:]"
938 
                  moduleName = "SuperMenu"
939 
                  usesParentBreakpointCondition = "Yes"
940 
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/SuperMenu/SuperMenu/multiple/AppManagePlugin.m"
941 
                  timestampString = "574234345.603299"
942 
                  startingColumnNumber = "9223372036854775807"
943 
                  endingColumnNumber = "9223372036854775807"
944 
                  startingLineNumber = "253"
945 
                  endingLineNumber = "253"
946 
                  offsetFromSymbolStart = "39">
947 
               </Location>
948 
               <Location
949 
                  shouldBeEnabled = "Yes"
950 
                  ignoreCount = "0"
951 
                  continueAfterRunningActions = "No"
952 
                  symbolName = "__27-[AppManagePlugin initNfc:]_block_invoke"
953 
                  moduleName = "SuperMenu"
954 
                  usesParentBreakpointCondition = "Yes"
955 
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/SuperMenu/SuperMenu/multiple/AppManagePlugin.m"
956 
                  timestampString = "574234345.605612"
957 
                  startingColumnNumber = "9223372036854775807"
958 
                  endingColumnNumber = "9223372036854775807"
959 
                  startingLineNumber = "255"
960 
                  endingLineNumber = "255"
961 
                  offsetFromSymbolStart = "69">
962 
               </Location>
963 
            </Locations>
964 916 
         </BreakpointContent>
965 917 
      </BreakpointProxy>
966 918 
      <BreakpointProxy
@ -975,24 +927,8 @@
975 927 
            endingColumnNumber = "9223372036854775807"
976 928 
            startingLineNumber = "269"
977 929 
            endingLineNumber = "269"
978 
            landmarkName = "-getSubAppParams"
979 
            landmarkType = "7">
980 
         </BreakpointContent>
981 
      </BreakpointProxy>
982 
      <BreakpointProxy
983 
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
984 
         <BreakpointContent
985 
            shouldBeEnabled = "Yes"
986 
            ignoreCount = "0"
987 
            continueAfterRunningActions = "No"
988 
            filePath = "SuperMenu/multiple/AppManagePlugin.m"
989 
            timestampString = "574234345.38548"
990 
            startingColumnNumber = "9223372036854775807"
991 
            endingColumnNumber = "9223372036854775807"
992 
            startingLineNumber = "277"
993 
            endingLineNumber = "277"
994 
            landmarkName = "-openNativeApp:url:"
995 
            landmarkType = "7">
930 
            landmarkName = "AppManagePlugin"
931 
            landmarkType = "3">
996 932 
         </BreakpointContent>
997 933 
      </BreakpointProxy>
998 934 
      <BreakpointProxy
@ -1119,7 +1055,23 @@
1119 1055 
            endingColumnNumber = "9223372036854775807"
1120 1056 
            startingLineNumber = "132"
1121 1057 
            endingLineNumber = "132"
1122 
            landmarkName = "-openRemoteURL:"
1058 
            landmarkName = "-openNativeApp:"
1059 
            landmarkType = "7">
1060 
         </BreakpointContent>
1061 
      </BreakpointProxy>
1062 
      <BreakpointProxy
1063 
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
1064 
         <BreakpointContent
1065 
            shouldBeEnabled = "Yes"
1066 
            ignoreCount = "0"
1067 
            continueAfterRunningActions = "No"
1068 
            filePath = "../WadeMobileFunc/WadeMobileFunc/WDFMobileUI.m"
1069 
            timestampString = "574593854.515074"
1070 
            startingColumnNumber = "9223372036854775807"
1071 
            endingColumnNumber = "9223372036854775807"
1072 
            startingLineNumber = "192"
1073 
            endingLineNumber = "192"
1074 
            landmarkName = "-openUrl:"
1123 1075 
            landmarkType = "7">
1124 1076 
         </BreakpointContent>
1125 1077 
      </BreakpointProxy>

+ 1 - 1
SuperMenu/SuperMenu.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
Wyświetl plik 

@ -7,7 +7,7 @@
7 7 
		<key>SuperMenu.xcscheme</key>
8 8 
		<dict>
9 9 
			<key>orderHint</key>
10 
			<integer>0</integer>
10 
			<integer>2</integer>
11 11 
		</dict>
12 12 
	</dict>
13 13 
</dict>

+ 1 - 1
SuperMenu/SuperMenu/Info.plist
Wyświetl plik 

@ -17,7 +17,7 @@
17 17 
	<key>CFBundlePackageType</key>
18 18 
	<string>APPL</string>
19 19 
	<key>CFBundleShortVersionString</key>
20 
	<string>3.0</string>
20 
	<string>1.0.5</string>
21 21 
	<key>CFBundleSignature</key>
22 22 
	<string>????</string>
23 23 
	<key>CFBundleURLTypes</key>

+ 1 - 1
SuperMenu/SuperMenu/multiple/AppManagePlugin.h
Wyświetl plik 

@ -23,6 +23,6 @@
23 23
24 24 
- (void) getAppsConfig:(NSArray *)args;
25 25
26 
- (void) openRemoteURL:(NSArray *)args;
26 
- (void) openRemoteURL:(NSArray *)param;
27 27
28 28 
@end

+ 40 - 17
SuperMenu/SuperMenu/multiple/AppManagePlugin.m
Wyświetl plik 

@ -275,23 +275,46 @@
275 275 
    return [NSString stringWithFormat:@"{\"%@\":\"%@\",\"%@\":\"%@\"}", KEY_SESSION, sessionId, KEY_STAFF_ID, staffId];
276 276 
}
277 277
278 
- (void) openRemoteURL:(NSArray *)args {
279 
    //    dispatch_time_t time = dispatch_time(DISPATCH_TIME_NOW, 0.5*NSEC_PER_SEC);
280 
    //    dispatch_after(time, dispatch_get_main_queue(), ^{
281 
    //        UIViewController *vc = [self.wademobile getViewController];
282 
    //
283 
    //        NSString *urlStr = @"https://m.10010.com/queen/tencent/king-tab.html?channel=2&from=singlemessage";
284 
    //        RemoteWebVC *webVC = [[RemoteWebVC alloc] initWithTitle:@"" urlPath:urlStr];
285 
    //
286 
    //        [vc presentViewController:webVC animated:NO completion:^{
287 
    //            ;
288 
    //        }];
289 
    //    });
290
291 
    //    NSString *urlStr = @"https://m.10010.com/queen/tencent/king-tab.html?channel=2&from=singlemessage";
292
293 
    if (args && args.count > 0) {
294 
        WDTemplateNavigateController *vc = [[WDTemplateNavigateController alloc] initWithUrl:args[0] Callback:nil Title:nil Operates:nil Colors:nil];
278 
- (void) openRemoteURL:(NSArray *)param {
279 
    if (param && param.count>0) {
280 
        if (param[0]==[NSNull null]) {
281 
            return;
282 
        }
283 
        NSString *url = param[0];
284 
        NSString *title = nil;
285 
        if (param.count>1) {
286 
            if (param[1]==[NSNull null]) {
287 
                title = nil;
288 
            }else{
289 
                title = param[1];
290 
            }
291 
        }
292 
        NSArray *operates = nil;
293 
        if (param.count>2) {
294 
            if (param[2]==[NSNull null]) {
295 
                operates = nil;
296 
            }else{
297 
                operates = param[2];
298 
            }
299 
        }
300 
        NSArray *colors = nil;
301 
        if (param.count>3) {
302 
            if (param[3]==[NSNull null]) {
303 
                colors = nil;
304 
            }else{
305 
                colors = param[3];
306 
            }
307 
        }
308 
        BOOL hiddenBar = false;
309 
        if (param.count>4) {
310 
            if (param[4]==[NSNull null]) {
311 
                hiddenBar = false;
312 
            }else{
313 
                hiddenBar = [param[4] boolValue];
314 
            }
315 
        }
316 
        WDTemplateNavigateController *vc = [[WDTemplateNavigateController alloc] initWithUrl:url Callback:nil Title:title Operates:operates Colors:colors Hidden:hiddenBar];
317 
        vc.plugin = self;
295 318 
        UINavigationController *nc = [[UINavigationController alloc] initWithRootViewController:vc];
296 319 
        [[self getViewController] presentViewController:nc animated:YES completion:^{
297 320

+ 3 - 3
WadeMobileFunc/WadeMobileFunc.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
Wyświetl plik 

@ -26,7 +26,7 @@
26 26 
                  moduleName = "WadeMobileFunc"
27 27 
                  usesParentBreakpointCondition = "Yes"
28 28 
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFSocial.m"
29 
                  timestampString = "574234345.662415"
29 
                  timestampString = "574657969.565012"
30 30 
                  startingColumnNumber = "9223372036854775807"
31 31 
                  endingColumnNumber = "9223372036854775807"
32 32 
                  startingLineNumber = "291"
 
@ -41,7 +41,7 @@
41 41 
                  moduleName = "WadeMobileFunc"
42 42 
                  usesParentBreakpointCondition = "Yes"
43 43 
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFSocial.m"
44 
                  timestampString = "574234345.6647559"
44 
                  timestampString = "574657969.567091"
45 45 
                  startingColumnNumber = "9223372036854775807"
46 46 
                  endingColumnNumber = "9223372036854775807"
47 47 
                  startingLineNumber = "292"
 
@ -56,7 +56,7 @@
56 56 
                  moduleName = "WadeMobileFunc"
57 57 
                  usesParentBreakpointCondition = "Yes"
58 58 
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFSocial.m"
59 
                  timestampString = "574234345.6666321"
59 
                  timestampString = "574657969.568895"
60 60 
                  startingColumnNumber = "9223372036854775807"
61 61 
                  endingColumnNumber = "9223372036854775807"
62 62 
                  startingLineNumber = "291"

+ 3 - 3
WadeMobileFunc/WadeMobileFunc.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
Wyświetl plik 

@ -7,17 +7,17 @@
7 7 
		<key>WadeMobileFunc.xcscheme</key>
8 8 
		<dict>
9 9 
			<key>orderHint</key>
10 
			<integer>10</integer>
10 
			<integer>3</integer>
11 11 
		</dict>
12 12 
		<key>WadeMobileFunc4Appstore.xcscheme</key>
13 13 
		<dict>
14 14 
			<key>orderHint</key>
15 
			<integer>11</integer>
15 
			<integer>5</integer>
16 16 
		</dict>
17 17 
		<key>WadeMobileFuncAggregate.xcscheme</key>
18 18 
		<dict>
19 19 
			<key>orderHint</key>
20 
			<integer>9</integer>
20 
			<integer>4</integer>
21 21 
		</dict>
22 22 
	</dict>
23 23 
</dict>

+ 13 - 1
WadeMobileFunc/WadeMobileFunc/WDFMobileUI.m
Wyświetl plik 

@ -190,6 +190,9 @@
190 190 
-(void) openUrl:(NSArray*)param
191 191 
{
192 192 
    if (param && param.count>0) {
193 
        if (param[0]==[NSNull null]) {
194 
            return;
195 
        }
193 196 
        NSString *url = param[0];
194 197 
        NSString *title = nil;
195 198 
        if (param.count>1) {
 
@ -215,7 +218,16 @@
215 218 
                colors = param[3];
216 219 
            }
217 220 
        }
218 
        WDTemplateNavigateController *vc = [[WDTemplateNavigateController alloc] initWithUrl:url Callback:nil Title:title Operates:operates Colors:colors];
221 
        BOOL hiddenBar = false;
222 
        if (param.count>4) {
223 
            if (param[4]==[NSNull null]) {
224 
                hiddenBar = false;
225 
            }else{
226 
                hiddenBar = [param[4] boolValue];
227 
            }
228 
        }
229 
//        WDTemplateNavigateController *vc = [[WDTemplateNavigateController alloc] initWithUrl:url Callback:nil Title:title Operates:operates Colors:colors];
230 
        WDTemplateNavigateController *vc = [[WDTemplateNavigateController alloc] initWithUrl:url Callback:nil Title:title Operates:operates Colors:colors Hidden:hiddenBar];
219 231 
        vc.plugin = self;
220 232 
        UINavigationController *nc = [[UINavigationController alloc] initWithRootViewController:vc];
221 233 
        [[self getViewController] presentViewController:nc animated:YES completion:^{

+ 1 - 1
display-center/ReactNative/node_modules/react-native-camera/ios/RNCamera.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
Wyświetl plik 

@ -7,7 +7,7 @@
7 7 
		<key>RNCamera.xcscheme</key>
8 8 
		<dict>
9 9 
			<key>orderHint</key>
10 
			<integer>24</integer>
10 
			<integer>28</integer>
11 11 
		</dict>
12 12 
	</dict>
13 13 
</dict>

+ 1 - 1
display-center/ReactNative/node_modules/react-native/Libraries/ART/ART.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
Wyświetl plik 

@ -17,7 +17,7 @@
17 17 
		<key>ART.xcscheme</key>
18 18 
		<dict>
19 19 
			<key>orderHint</key>
20 
			<integer>23</integer>
20 
			<integer>38</integer>
21 21 
		</dict>
22 22 
	</dict>
23 23 
</dict>

+ 1 - 1
display-center/ReactNative/node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
Wyświetl plik 

@ -17,7 +17,7 @@
17 17 
		<key>RCTBlob.xcscheme</key>
18 18 
		<dict>
19 19 
			<key>orderHint</key>
20 
			<integer>26</integer>
20 
			<integer>32</integer>
21 21 
		</dict>
22 22 
	</dict>
23 23 
</dict>

+ 1 - 1
display-center/ReactNative/node_modules/react-native/Libraries/CameraRoll/RCTCameraRoll.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
Wyświetl plik 

@ -7,7 +7,7 @@
7 7 
		<key>RCTCameraRoll.xcscheme</key>
8 8 
		<dict>
9 9 
			<key>orderHint</key>
10 
			<integer>27</integer>
10 
			<integer>33</integer>
11 11 
		</dict>
12 12 
	</dict>
13 13 
</dict>

+ 1 - 1
display-center/ReactNative/node_modules/react-native/Libraries/Geolocation/RCTGeolocation.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
Wyświetl plik 

@ -7,7 +7,7 @@
7 7 
		<key>RCTGeolocation.xcscheme</key>
8 8 
		<dict>
9 9 
			<key>orderHint</key>
10 
			<integer>28</integer>
10 
			<integer>34</integer>
11 11 
		</dict>
12 12 
	</dict>
13 13 
</dict>

+ 1 - 1
display-center/ReactNative/node_modules/react-native/Libraries/Image/RCTImage.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
Wyświetl plik 

@ -17,7 +17,7 @@
17 17 
		<key>RCTImage.xcscheme</key>
18 18 
		<dict>
19 19 
			<key>orderHint</key>
20 
			<integer>29</integer>
20 
			<integer>35</integer>
21 21 
		</dict>
22 22 
	</dict>
23 23 
</dict>

+ 1 - 1
display-center/ReactNative/node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
Wyświetl plik 

@ -17,7 +17,7 @@
17 17 
		<key>RCTLinking.xcscheme</key>
18 18 
		<dict>
19 19 
			<key>orderHint</key>
20 
			<integer>30</integer>
20 
			<integer>36</integer>
21 21 
		</dict>
22 22 
	</dict>
23 23 
</dict>

+ 1 - 1
display-center/ReactNative/node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
Wyświetl plik 

@ -17,7 +17,7 @@
17 17 
		<key>RCTAnimation.xcscheme</key>
18 18 
		<dict>
19 19 
			<key>orderHint</key>
20 
			<integer>38</integer>
20 
			<integer>44</integer>
21 21 
		</dict>
22 22 
	</dict>
23 23 
</dict>

+ 1 - 1
display-center/ReactNative/node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
Wyświetl plik 

@ -17,7 +17,7 @@
17 17 
		<key>RCTNetwork.xcscheme</key>
18 18 
		<dict>
19 19 
			<key>orderHint</key>
20 
			<integer>39</integer>
20 
			<integer>45</integer>
21 21 
		</dict>
22 22 
	</dict>
23 23 
</dict>

+ 1 - 1
display-center/ReactNative/node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
Wyświetl plik 

@ -17,7 +17,7 @@
17 17 
		<key>RCTSettings.xcscheme</key>
18 18 
		<dict>
19 19 
			<key>orderHint</key>
20 
			<integer>40</integer>
20 
			<integer>46</integer>
21 21 
		</dict>
22 22 
	</dict>
23 23 
</dict>

+ 1 - 1
display-center/ReactNative/node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
Wyświetl plik 

@ -7,7 +7,7 @@
7 7 
		<key>RCTVibration.xcscheme</key>
8 8 
		<dict>
9 9 
			<key>orderHint</key>
10 
			<integer>41</integer>
10 
			<integer>47</integer>
11 11 
		</dict>
12 12 
	</dict>
13 13 
</dict>

+ 2 - 2
display-center/ReactNative/node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
Wyświetl plik 

@ -17,7 +17,7 @@
17 17 
		<key>RCTWebSocket.xcscheme</key>
18 18 
		<dict>
19 19 
			<key>orderHint</key>
20 
			<integer>42</integer>
20 
			<integer>48</integer>
21 21 
		</dict>
22 22 
		<key>fishhook-tvOS.xcscheme</key>
23 23 
		<dict>
 
@ -32,7 +32,7 @@
32 32 
		<key>fishhook.xcscheme</key>
33 33 
		<dict>
34 34 
			<key>orderHint</key>
35 
			<integer>36</integer>
35 
			<integer>49</integer>
36 36 
		</dict>
37 37 
	</dict>
38 38 
</dict>

+ 8 - 8
display-center/ReactNative/node_modules/react-native/React/React.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
Wyświetl plik 

@ -32,12 +32,12 @@
32 32 
		<key>cxxreact-tvOS.xcscheme_^#shared#^_</key>
33 33 
		<dict>
34 34 
			<key>orderHint</key>
35 
			<integer>2</integer>
35 
			<integer>3</integer>
36 36 
		</dict>
37 37 
		<key>cxxreact.xcscheme</key>
38 38 
		<dict>
39 39 
			<key>orderHint</key>
40 
			<integer>25</integer>
40 
			<integer>31</integer>
41 41 
		</dict>
42 42 
		<key>double-conversion-tvOS.xcscheme</key>
43 43 
		<dict>
 
@ -52,7 +52,7 @@
52 52 
		<key>double-conversion.xcscheme</key>
53 53 
		<dict>
54 54 
			<key>orderHint</key>
55 
			<integer>32</integer>
55 
			<integer>39</integer>
56 56 
		</dict>
57 57 
		<key>jschelpers-tvOS.xcscheme</key>
58 58 
		<dict>
 
@ -67,7 +67,7 @@
67 67 
		<key>jschelpers.xcscheme</key>
68 68 
		<dict>
69 69 
			<key>orderHint</key>
70 
			<integer>33</integer>
70 
			<integer>40</integer>
71 71 
		</dict>
72 72 
		<key>jsinspector-tvOS.xcscheme</key>
73 73 
		<dict>
 
@ -82,7 +82,7 @@
82 82 
		<key>jsinspector.xcscheme</key>
83 83 
		<dict>
84 84 
			<key>orderHint</key>
85 
			<integer>34</integer>
85 
			<integer>41</integer>
86 86 
		</dict>
87 87 
		<key>privatedata-tvOS.xcscheme</key>
88 88 
		<dict>
 
@ -97,7 +97,7 @@
97 97 
		<key>privatedata.xcscheme</key>
98 98 
		<dict>
99 99 
			<key>orderHint</key>
100 
			<integer>37</integer>
100 
			<integer>43</integer>
101 101 
		</dict>
102 102 
		<key>third-party-tvOS.xcscheme</key>
103 103 
		<dict>
 
@ -112,7 +112,7 @@
112 112 
		<key>third-party.xcscheme</key>
113 113 
		<dict>
114 114 
			<key>orderHint</key>
115 
			<integer>35</integer>
115 
			<integer>42</integer>
116 116 
		</dict>
117 117 
		<key>yoga-tvOS.xcscheme</key>
118 118 
		<dict>
 
@ -127,7 +127,7 @@
127 127 
		<key>yoga.xcscheme</key>
128 128 
		<dict>
129 129 
			<key>orderHint</key>
130 
			<integer>31</integer>
130 
			<integer>37</integer>
131 131 
		</dict>
132 132 
	</dict>
133 133 
	<key>SuppressBuildableAutocreation</key>

+ 4 - 4
display-center/Res/config/mobile-config.xml
Wyświetl plik 

@ -1,8 +1,8 @@
1 1 
<?xml version="1.0" encoding="utf-8"?>
2 2 
<configs>
3 3 
    <!--appstore 正式环境-->
4 
    <config name="request_host" value="http://www.aiipu.com:8083"/>
5 
    <config name="request_path" value="/show"/>
4 
<!--    <config name="request_host" value="http://www.aiipu.com:8083"/>-->
5 
<!--    <config name="request_path" value="/show"/>-->
6 6
7 7 
    <!--chengwb 测试环境-->
8 8 
<!--    <config name="request_host" value="http://121.42.183.206:8084"/>-->
 
@ -10,8 +10,8 @@
10 10
11 11 
    <!--lfl-->
12 12 
<!--    <config name="request_host" value="http://192.168.31.239:8080"/>-->
13 
<!--    <config name="request_host" value="http://172.20.10.4:8080"/>-->
14 
<!--    <config name="request_path" value="/show"/>-->
13 
    <config name="request_host" value="http://172.20.10.4:8080"/>
14 
    <config name="request_path" value="/show"/>
15 15
16 16 
    <config name="request_servlet" value="/mobiledata"/>
17 17 
    <config name="loading_page" value="Res/local/welcome.html"/>

+ 40 - 40
display-center/display-center.xcodeproj/project.pbxproj
Wyświetl plik 

@ -94,44 +94,44 @@
94 94 
/* End PBXBuildFile section */
95 95
96 96 
/* Begin PBXContainerItemProxy section */
97 
		04627EDD2238B48F0083A956 /* PBXContainerItemProxy */ = {
97 
		047730B5223F9C6B00709882 /* PBXContainerItemProxy */ = {
98 98 
			isa = PBXContainerItemProxy;
99 
			containerPortal = 04627EAC2238B48E0083A956 /* WadeMobile.xcodeproj */;
99 
			containerPortal = 047730AC223F9C6B00709882 /* WadeMobile.xcodeproj */;
100 100 
			proxyType = 2;
101 101 
			remoteGlobalIDString = 614A1CD61B2142130099793B;
102 102 
			remoteInfo = WadeMobile;
103 103 
		};
104 
		04627EDF2238B48F0083A956 /* PBXContainerItemProxy */ = {
104 
		047730B7223F9C6B00709882 /* PBXContainerItemProxy */ = {
105 105 
			isa = PBXContainerItemProxy;
106 
			containerPortal = 04627EAC2238B48E0083A956 /* WadeMobile.xcodeproj */;
106 
			containerPortal = 047730AC223F9C6B00709882 /* WadeMobile.xcodeproj */;
107 107 
			proxyType = 2;
108 108 
			remoteGlobalIDString = 614A1CE11B2142130099793B;
109 109 
			remoteInfo = WadeMobileTests;
110 110 
		};
111 
		04627EE12238B48F0083A956 /* PBXContainerItemProxy */ = {
111 
		047730B9223F9C6B00709882 /* PBXContainerItemProxy */ = {
112 112 
			isa = PBXContainerItemProxy;
113 
			containerPortal = 04627EAC2238B48E0083A956 /* WadeMobile.xcodeproj */;
113 
			containerPortal = 047730AC223F9C6B00709882 /* WadeMobile.xcodeproj */;
114 114 
			proxyType = 2;
115 115 
			remoteGlobalIDString = E2D93A741B89BA2800D1DE7C;
116 116 
			remoteInfo = WadeMobileBundle;
117 117 
		};
118 
		04627EE32238B48F0083A956 /* PBXContainerItemProxy */ = {
118 
		047730BB223F9C6B00709882 /* PBXContainerItemProxy */ = {
119 119 
			isa = PBXContainerItemProxy;
120 
			containerPortal = 04627EAC2238B48E0083A956 /* WadeMobile.xcodeproj */;
120 
			containerPortal = 047730AC223F9C6B00709882 /* WadeMobile.xcodeproj */;
121 121 
			proxyType = 2;
122 122 
			remoteGlobalIDString = 0A791C221FD102C0003CD586;
123 123 
			remoteInfo = WadeMobileTestUnit;
124 124 
		};
125 
		04627EEC2238B4A40083A956 /* PBXContainerItemProxy */ = {
125 
		047730C4223F9C7500709882 /* PBXContainerItemProxy */ = {
126 126 
			isa = PBXContainerItemProxy;
127 
			containerPortal = 04627EE52238B4A40083A956 /* WadeMobileFunc.xcodeproj */;
127 
			containerPortal = 047730BD223F9C7500709882 /* WadeMobileFunc.xcodeproj */;
128 128 
			proxyType = 2;
129 129 
			remoteGlobalIDString = E2DE1AD41B42DD9500762141;
130 130 
			remoteInfo = WadeMobileFunc;
131 131 
		};
132 
		04627EEE2238B4A40083A956 /* PBXContainerItemProxy */ = {
132 
		047730C6223F9C7500709882 /* PBXContainerItemProxy */ = {
133 133 
			isa = PBXContainerItemProxy;
134 
			containerPortal = 04627EE52238B4A40083A956 /* WadeMobileFunc.xcodeproj */;
134 
			containerPortal = 047730BD223F9C7500709882 /* WadeMobileFunc.xcodeproj */;
135 135 
			proxyType = 2;
136 136 
			remoteGlobalIDString = 0AE1E0841C7EE95900FCCD24;
137 137 
			remoteInfo = WadeMobileFuncTests;
 
@ -447,8 +447,8 @@
447 447 
		0429A206218046E2003CEE83 /* WadeMobileFuncBundle.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = WadeMobileFuncBundle.bundle; path = ../IpuCommon/Frameworks/WadeMobileFuncBundle.bundle; sourceTree = "<group>"; };
448 448 
		0429A2332180484E003CEE83 /* fontawesome-webfont.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "fontawesome-webfont.ttf"; path = "../IpuCommon/Frameworks/fontawesome-webfont.ttf"; sourceTree = "<group>"; };
449 449 
		0460E86220AA9C1300CCFDA4 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
450 
		04627EAC2238B48E0083A956 /* WadeMobile.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = WadeMobile.xcodeproj; path = ../../ios/WadeMobile/WadeMobile.xcodeproj; sourceTree = "<group>"; };
451 
		04627EE52238B4A40083A956 /* WadeMobileFunc.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = WadeMobileFunc.xcodeproj; path = ../WadeMobileFunc/WadeMobileFunc.xcodeproj; sourceTree = "<group>"; };
450 
		047730AC223F9C6B00709882 /* WadeMobile.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = WadeMobile.xcodeproj; path = ../../ios/WadeMobile/WadeMobile.xcodeproj; sourceTree = "<group>"; };
451 
		047730BD223F9C7500709882 /* WadeMobileFunc.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = WadeMobileFunc.xcodeproj; path = ../WadeMobileFunc/WadeMobileFunc.xcodeproj; sourceTree = "<group>"; };
452 452 
		B247A76B20E0D33A00117A38 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
453 453 
		B247A76D20E0D34100117A38 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
454 454 
		B247A76F20E0D34700117A38 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 
@ -620,22 +620,22 @@
620 620 
			name = Frameworks;
621 621 
			sourceTree = "<group>";
622 622 
		};
623 
		04627EAD2238B48E0083A956 /* Products */ = {
623 
		047730AD223F9C6B00709882 /* Products */ = {
624 624 
			isa = PBXGroup;
625 625 
			children = (
626 
				04627EDE2238B48F0083A956 /* WadeMobile.framework */,
627 
				04627EE02238B48F0083A956 /* WadeMobileTests.xctest */,
628 
				04627EE22238B48F0083A956 /* WadeMobileBundle.bundle */,
629 
				04627EE42238B48F0083A956 /* WadeMobileTestUnit.xctest */,
626 
				047730B6223F9C6B00709882 /* WadeMobile.framework */,
627 
				047730B8223F9C6B00709882 /* WadeMobileTests.xctest */,
628 
				047730BA223F9C6B00709882 /* WadeMobileBundle.bundle */,
629 
				047730BC223F9C6B00709882 /* WadeMobileTestUnit.xctest */,
630 630 
			);
631 631 
			name = Products;
632 632 
			sourceTree = "<group>";
633 633 
		};
634 
		04627EE62238B4A40083A956 /* Products */ = {
634 
		047730BE223F9C7500709882 /* Products */ = {
635 635 
			isa = PBXGroup;
636 636 
			children = (
637 
				04627EED2238B4A40083A956 /* WadeMobileFunc.framework */,
638 
				04627EEF2238B4A40083A956 /* WadeMobileFuncTests.xctest */,
637 
				047730C5223F9C7500709882 /* WadeMobileFunc.framework */,
638 
				047730C7223F9C7500709882 /* WadeMobileFuncTests.xctest */,
639 639 
			);
640 640 
			name = Products;
641 641 
			sourceTree = "<group>";
 
@ -865,8 +865,8 @@
865 865 
		EA8712331ECD8B580045E19A = {
866 866 
			isa = PBXGroup;
867 867 
			children = (
868 
				04627EE52238B4A40083A956 /* WadeMobileFunc.xcodeproj */,
869 
				04627EAC2238B48E0083A956 /* WadeMobile.xcodeproj */,
868 
				047730BD223F9C7500709882 /* WadeMobileFunc.xcodeproj */,
869 
				047730AC223F9C6B00709882 /* WadeMobile.xcodeproj */,
870 870 
				B2E563B921E5E07A00B67E21 /* mapapi.bundle */,
871 871 
				B2E5637921E4A39E00B67E21 /* BDMapLibs */,
872 872 
				B2E563A821E4A39E00B67E21 /* IpuBDMap */,
 
@ -1038,12 +1038,12 @@
1038 1038 
					ProjectRef = B2FC4AD52191392D008F7621 /* RNCamera.xcodeproj */;
1039 1039 
				},
1040 1040 
				{
1041 
					ProductGroup = 04627EAD2238B48E0083A956 /* Products */;
1042 
					ProjectRef = 04627EAC2238B48E0083A956 /* WadeMobile.xcodeproj */;
1041 
					ProductGroup = 047730AD223F9C6B00709882 /* Products */;
1042 
					ProjectRef = 047730AC223F9C6B00709882 /* WadeMobile.xcodeproj */;
1043 1043 
				},
1044 1044 
				{
1045 
					ProductGroup = 04627EE62238B4A40083A956 /* Products */;
1046 
					ProjectRef = 04627EE52238B4A40083A956 /* WadeMobileFunc.xcodeproj */;
1045 
					ProductGroup = 047730BE223F9C7500709882 /* Products */;
1046 
					ProjectRef = 047730BD223F9C7500709882 /* WadeMobileFunc.xcodeproj */;
1047 1047 
				},
1048 1048 
			);
1049 1049 
			projectRoot = "";
 
@ -1054,46 +1054,46 @@
1054 1054 
/* End PBXProject section */
1055 1055
1056 1056 
/* Begin PBXReferenceProxy section */
1057 
		04627EDE2238B48F0083A956 /* WadeMobile.framework */ = {
1057 
		047730B6223F9C6B00709882 /* WadeMobile.framework */ = {
1058 1058 
			isa = PBXReferenceProxy;
1059 1059 
			fileType = wrapper.framework;
1060 1060 
			path = WadeMobile.framework;
1061 
			remoteRef = 04627EDD2238B48F0083A956 /* PBXContainerItemProxy */;
1061 
			remoteRef = 047730B5223F9C6B00709882 /* PBXContainerItemProxy */;
1062 1062 
			sourceTree = BUILT_PRODUCTS_DIR;
1063 1063 
		};
1064 
		04627EE02238B48F0083A956 /* WadeMobileTests.xctest */ = {
1064 
		047730B8223F9C6B00709882 /* WadeMobileTests.xctest */ = {
1065 1065 
			isa = PBXReferenceProxy;
1066 1066 
			fileType = wrapper.cfbundle;
1067 1067 
			path = WadeMobileTests.xctest;
1068 
			remoteRef = 04627EDF2238B48F0083A956 /* PBXContainerItemProxy */;
1068 
			remoteRef = 047730B7223F9C6B00709882 /* PBXContainerItemProxy */;
1069 1069 
			sourceTree = BUILT_PRODUCTS_DIR;
1070 1070 
		};
1071 
		04627EE22238B48F0083A956 /* WadeMobileBundle.bundle */ = {
1071 
		047730BA223F9C6B00709882 /* WadeMobileBundle.bundle */ = {
1072 1072 
			isa = PBXReferenceProxy;
1073 1073 
			fileType = wrapper.cfbundle;
1074 1074 
			path = WadeMobileBundle.bundle;
1075 
			remoteRef = 04627EE12238B48F0083A956 /* PBXContainerItemProxy */;
1075 
			remoteRef = 047730B9223F9C6B00709882 /* PBXContainerItemProxy */;
1076 1076 
			sourceTree = BUILT_PRODUCTS_DIR;
1077 1077 
		};
1078 
		04627EE42238B48F0083A956 /* WadeMobileTestUnit.xctest */ = {
1078 
		047730BC223F9C6B00709882 /* WadeMobileTestUnit.xctest */ = {
1079 1079 
			isa = PBXReferenceProxy;
1080 1080 
			fileType = wrapper.cfbundle;
1081 1081 
			path = WadeMobileTestUnit.xctest;
1082 
			remoteRef = 04627EE32238B48F0083A956 /* PBXContainerItemProxy */;
1082 
			remoteRef = 047730BB223F9C6B00709882 /* PBXContainerItemProxy */;
1083 1083 
			sourceTree = BUILT_PRODUCTS_DIR;
1084 1084 
		};
1085 
		04627EED2238B4A40083A956 /* WadeMobileFunc.framework */ = {
1085 
		047730C5223F9C7500709882 /* WadeMobileFunc.framework */ = {
1086 1086 
			isa = PBXReferenceProxy;
1087 1087 
			fileType = wrapper.framework;
1088 1088 
			path = WadeMobileFunc.framework;
1089 
			remoteRef = 04627EEC2238B4A40083A956 /* PBXContainerItemProxy */;
1089 
			remoteRef = 047730C4223F9C7500709882 /* PBXContainerItemProxy */;
1090 1090 
			sourceTree = BUILT_PRODUCTS_DIR;
1091 1091 
		};
1092 
		04627EEF2238B4A40083A956 /* WadeMobileFuncTests.xctest */ = {
1092 
		047730C7223F9C7500709882 /* WadeMobileFuncTests.xctest */ = {
1093 1093 
			isa = PBXReferenceProxy;
1094 1094 
			fileType = wrapper.cfbundle;
1095 1095 
			path = WadeMobileFuncTests.xctest;
1096 
			remoteRef = 04627EEE2238B4A40083A956 /* PBXContainerItemProxy */;
1096 
			remoteRef = 047730C6223F9C7500709882 /* PBXContainerItemProxy */;
1097 1097 
			sourceTree = BUILT_PRODUCTS_DIR;
1098 1098 
		};
1099 1099 
		B25B8FE021901B0C001A240E /* libRCTWebSocket.a */ = {

BIN
display-center/display-center.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate
Wyświetl plik


+ 7 - 23
display-center/display-center.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
Wyświetl plik 

@ -136,7 +136,7 @@
136 136 
            ignoreCount = "0"
137 137 
            continueAfterRunningActions = "No"
138 138 
            filePath = "../../ios/WadeMobile/WadeMobile/frame/template/IpuTemplateSubController.m"
139 
            timestampString = "557052540.358753"
139 
            timestampString = "574603983.712311"
140 140 
            startingColumnNumber = "9223372036854775807"
141 141 
            endingColumnNumber = "9223372036854775807"
142 142 
            startingLineNumber = "206"
 
@ -567,30 +567,14 @@
567 567 
            shouldBeEnabled = "Yes"
568 568 
            ignoreCount = "0"
569 569 
            continueAfterRunningActions = "No"
570 
            filePath = "display-center/ViewController.m"
571 
            timestampString = "574149683.094046"
570 
            filePath = "../../ios/WadeMobile/WadeMobile/frame/template/WDTemplateNavigateController.m"
571 
            timestampString = "574654776.2638479"
572 572 
            startingColumnNumber = "9223372036854775807"
573 573 
            endingColumnNumber = "9223372036854775807"
574 
            startingLineNumber = "85"
575 
            endingLineNumber = "85"
576 
            landmarkName = "-back"
577 
            landmarkType = "7">
578 
         </BreakpointContent>
579 
      </BreakpointProxy>
580 
      <BreakpointProxy
581 
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
582 
         <BreakpointContent
583 
            shouldBeEnabled = "Yes"
584 
            ignoreCount = "0"
585 
            continueAfterRunningActions = "No"
586 
            filePath = "display-center/ViewController.m"
587 
            timestampString = "574149683.094344"
588 
            startingColumnNumber = "9223372036854775807"
589 
            endingColumnNumber = "9223372036854775807"
590 
            startingLineNumber = "87"
591 
            endingLineNumber = "87"
592 
            landmarkName = "-back"
593 
            landmarkType = "7">
574 
            startingLineNumber = "242"
575 
            endingLineNumber = "242"
576 
            landmarkName = "WDTemplateNavigateController"
577 
            landmarkType = "3">
594 578 
         </BreakpointContent>
595 579 
      </BreakpointProxy>
596 580 
   </Breakpoints>

+ 8 - 7
display-center/display-center/ViewController.m
Wyświetl plik 

@ -17,6 +17,13 @@
17 17 
#import <IpuRNKit/IpuRNViewControllerUtil.h>
18 18 
#import <IpuRNKit/IpuRNBaseViewController.h>
19 19
20 
#import <WadeMobile/WDTemplateNavigateController.h>
21
22 
#define ButtonWH 40
23 
#define Padding 5
24 
#define ScreenWidth  CGRectGetWidth([UIScreen mainScreen].bounds)
25 
#define ScreenHeight CGRectGetHeight([UIScreen mainScreen].bounds)
26
20 27 
@interface ViewController ()
21 28
22 29 
@property(nonatomic,strong)IPUDragButton *dragButton;
 
@ -27,18 +34,12 @@
27 34
28 35 
- (void)viewDidLoad {
29 36 
    [super viewDidLoad];
30
31 
    self.dragButton = [IPUDragButton sharedButton];
37 
    self.dragButton = [[IPUDragButton alloc] initWithFrame:CGRectMake(ScreenWidth-Padding-ButtonWH, ScreenHeight-3*ButtonWH, ButtonWH, ButtonWH)];
32 38 
    [self.dragButton addTarget:self action:@selector(back) forControlEvents:UIControlEventTouchUpInside];
33 39 
    [self.view addSubview:self.dragButton];
34
35 40 
    //    [IpuRNManager updateRNResource];
36 41 
}
37 42
38 
- (void)viewDidAppear:(BOOL)animated {
39 
    [super viewDidAppear:animated];
40 
}
41
42 43 
/*
43 44 
 悬浮按钮返回事件
44 45 
 */

封装考勤规则管理接口 · e951e5e09c - Nuosi Git Service
Home Explore Help
Sign In
asiainfo
/
ebc
Watch 4
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Commits 285 Releases 0 Wiki
Browse Source

封装考勤规则管理接口

wangdong6 4 years ago
parent
f5a7ef17bd
commit
e951e5e09c
14 changed files with 788 additions and 9 deletions
Split View Show Diff Stats
  1. 157 0
      security-protection-service/pom.xml
  2. 61 0
      security-protection-service/src/main/assembly/package.xml
  3. 2 0
      security-protection-service/src/main/java/com/ai/bss/security/protection/SecurityProtectionApp.java
  4. 84 0
      security-protection-service/src/main/java/com/ai/bss/security/protection/controller/AttendanceCommonController.java
  5. 22 3
      security-protection-service/src/main/java/com/ai/bss/security/protection/controller/attendanceRulesController.java
  6. 75 0
      security-protection-service/src/main/java/com/ai/bss/security/protection/controller/WorkShiftController.java
  7. 90 0
      security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AttendanceCommonServiceImpl.java
  8. 55 0
      security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AttendanceRulesServiceImpl.java
  9. 92 0
      security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/WorkShiftServiceImpl.java
  10. 44 0
      security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/AttendanceCommonService.java
  11. 9 0
      security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/AttendanceRulesService.java
  12. 44 0
      security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/WorkShiftService.java
  13. 19 0
      security-protection-service/src/main/java/com/ai/bss/security/protection/utils/SecurityConfigSEVEN.java
  14. 34 6
      security-protection-service/src/main/resources/application.properties

+ 157 - 0
security-protection-service/pom.xml
View File 

@ -44,6 +44,65 @@
44 44 
                        spring-boot-starter-security
45 45 
                    </artifactId>
46 46 
                </exclusion>
47 
                <exclusion>
48 
                    <groupId>org.springframework.boot</groupId>
49 
                    <artifactId>
50 
                        spring-boot-starter-test
51 
                    </artifactId>
52 
                </exclusion>
53 
                <exclusion>
54 
                    <groupId>org.hibernate</groupId>
55 
                    <artifactId>
56 
                        hibernate-envers
57 
                    </artifactId>
58 
                </exclusion>
59 
            </exclusions>
60 
        </dependency>
61
62 
        <dependency>
63 
            <groupId>com.ai.bss</groupId>
64 
            <artifactId>system-user-service-api</artifactId>
65 
            <version>2.1-SNAPSHOT</version>
66 
        </dependency>
67
68 
        <dependency>
69 
            <groupId>com.ai.bss</groupId>
70 
            <artifactId>work-attendance-service</artifactId>
71 
            <version>2.1.5-SNAPSHOT</version>
72 
            <exclusions>
73 
                <exclusion>
74 
                    <groupId>org.springframework.boot</groupId>
75 
                    <artifactId>
76 
                        spring-boot-starter-security
77 
                    </artifactId>
78 
                </exclusion>
79 
            </exclusions>
80 
        </dependency>
81
82 
        <dependency>
83 
            <groupId>com.ai.bss</groupId>
84 
            <artifactId>work-attendance-service-api</artifactId>
85 
            <version>2.1.5-SNAPSHOT</version>
86 
        </dependency>
87
88
89 
        <dependency>
90 
            <groupId>com.ai.bss</groupId>
91 
            <artifactId>work-service-api</artifactId>
92 
            <version>2.1.5-SNAPSHOT</version>
93 
        </dependency>
94
95 
        <dependency>
96 
            <groupId>com.ai.bss</groupId>
97 
            <artifactId>work-service</artifactId>
98 
            <version>2.1.5-SNAPSHOT</version>
99 
            <exclusions>
100 
                <exclusion>
101 
                    <groupId>org.springframework.boot</groupId>
102 
                    <artifactId>
103 
                        spring-boot-starter-security
104 
                    </artifactId>
105 
                </exclusion>
47 106 
            </exclusions>
48 107 
        </dependency>
49 108 
    </dependencies>
 
@ -69,4 +128,102 @@
69 128 
            </snapshots>
70 129 
        </pluginRepository>
71 130 
    </pluginRepositories>
131
132
133
134 
    <build>
135
136 
        <resources>
137 
            <resource>
138 
                <directory>src/main/resources</directory>
139 
            </resource>
140 
        </resources>
141
142 
        <plugins>
143
144 
            <!-- The configuration of maven-jar-plugin -->
145 
            <plugin>
146 
                <groupId>org.apache.maven.plugins</groupId>
147 
                <artifactId>maven-jar-plugin</artifactId>
148 
                <version>2.4</version>
149 
                <!-- The configuration of the plugin -->
150 
                <configuration>
151 
                    <!-- Configuration of the archiver -->
152 
                    <archive>
153 
                        <!--生成的jar中，不要包含pom.xml和pom.properties这两个文件-->
154 
                        <addMavenDescriptor>false</addMavenDescriptor>
155
156 
                        <!-- Manifest specific configuration -->
157 
                        <manifest>
158 
                            <!--是否要把第三方jar放到manifest的classpath中-->
159 
                            <addClasspath>true</addClasspath>
160 
                            <!--生成的manifest中classpath的前缀，因为要把第三方jar放到lib目录下，所以classpath的前缀是lib/-->
161 
                            <classpathPrefix>lib/</classpathPrefix>
162 
                            <!--应用的main class-->
163 
                            <mainClass>com.ai.bss.security.protection.SecurityProtectionApp</mainClass>
164 
                        </manifest>
165 
                        <manifestEntries>
166 
                            <Class-Path>./config/</Class-Path>
167 
                        </manifestEntries>
168 
                    </archive>
169 
                    <!--过滤掉不希望包含在jar中的文件-->
170 
                    <excludes>
171 
                        <exclude>**/*.properties</exclude>
172 
                        <exclude>**/*.xml</exclude>
173 
                    </excludes>
174 
                </configuration>
175 
            </plugin>
176
177 
            <plugin>
178 
                <groupId>org.apache.maven.plugins</groupId>
179 
                <artifactId>maven-dependency-plugin</artifactId>
180 
                <version>2.10</version>
181 
                <executions>
182 
                    <execution>
183 
                        <id>copy-dependencies</id>
184 
                        <phase>package</phase>
185 
                        <goals>
186 
                            <goal>copy-dependencies</goal>
187 
                        </goals>
188 
                        <configuration>
189 
                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
190 
                            <outputAbsoluteArtifactFilename></outputAbsoluteArtifactFilename>
191 
                        </configuration>
192 
                    </execution>
193 
                </executions>
194 
            </plugin>
195
196 
            <!-- The configuration of maven-assembly-plugin -->
197 
            <plugin>
198 
                <groupId>org.apache.maven.plugins</groupId>
199 
                <artifactId>maven-assembly-plugin</artifactId>
200 
                <version>2.4</version>
201 
                <!-- The configuration of the plugin -->
202 
                <configuration>
203 
                    <!-- Specifies the configuration file of the assembly plugin -->
204 
                    <descriptors>
205 
                        <descriptor>src/main/assembly/package.xml</descriptor>
206 
                    </descriptors>
207 
                </configuration>
208 
                <executions>
209 
                    <execution>
210 
                        <id>make-assembly</id>
211 
                        <phase>package</phase>
212 
                        <goals>
213 
                            <goal>single</goal>
214 
                        </goals>
215 
                    </execution>
216 
                </executions>
217 
            </plugin>
218
219 
            <plugin>
220 
                <groupId>org.apache.maven.plugins</groupId>
221 
                <artifactId>maven-surefire-plugin</artifactId>
222 
                <configuration>
223 
                    <skip>true</skip>
224 
                </configuration>
225 
            </plugin>
226 
        </plugins>
227
228 
    </build>
72 229 
</project>

+ 61 - 0
security-protection-service/src/main/assembly/package.xml
View File 

@ -0,0 +1,61 @@
1 
<assembly>
2 
    <id>bin</id>
3 
    <!-- 最终打包成一个用于发布的zip文件 -->
4 
    <formats>
5 
        <format>zip</format>
6 
    </formats>
7
8 
    <!-- Adds dependencies to zip package under lib directory -->
9 
    <dependencySets>
10 
        <dependencySet>
11 
            <!-- 不使用项目的artifact，第三方jar不要解压，打包进zip文件的lib目录 -->
12 
            <useProjectArtifact>false</useProjectArtifact>
13 
            <outputDirectory>lib</outputDirectory>
14 
            <unpack>false</unpack>
15 
            <scope>runtime</scope>
16
17 
        </dependencySet>
18 
    </dependencySets>
19
20
21 
    <fileSets>
22 
        <!-- 把项目相关的说明文件，打包进zip文件的根目录 -->
23 
        <fileSet>
24 
            <directory>${project.basedir}</directory>
25 
            <outputDirectory>/</outputDirectory>
26 
        <includes>
27 
            <include>README*</include>
28 
            <include>LICENSE*</include>
29 
            <include>NOTICE*</include>
30 
        </includes>
31 
    </fileSet>
32
33 
        <!-- 把项目的配置文件，打包进zip文件的config目录 -->
34 
        <fileSet>
35 
            <directory>src/main/resources</directory>
36 
            <outputDirectory>/config</outputDirectory>
37 
            <includes>
38 
                <include>**/*.properties</include>
39 
                <include>**/*.xml</include>
40 
            </includes>
41 
        </fileSet>
42
43 
        <!-- 把项目的脚本文件目录（ src/main/scripts ）中的启动脚本文件，打包进zip文件的跟目录 -->
44 
        <fileSet>
45 
            <directory>${project.build.scriptSourceDirectory}</directory>
46 
            <outputDirectory></outputDirectory>
47 
            <includes>
48 
                <include>startup.*</include>
49 
            </includes>
50 
        </fileSet>
51
52 
        <!-- 把项目自己编译出来的jar文件，打包进zip文件的根目录 -->
53 
        <fileSet>
54 
            <directory>${project.build.directory}</directory>
55 
            <outputDirectory></outputDirectory>
56 
            <includes>
57 
                <include>*.jar</include>
58 
            </includes>
59 
        </fileSet>
60 
    </fileSets>
61 
</assembly>

+ 2 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/SecurityProtectionApp.java
View File 

@ -6,10 +6,12 @@ import org.springframework.boot.autoconfigure.domain.EntityScan;
6 6 
import org.springframework.context.annotation.ComponentScan;
7 7 
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
8 8 
import org.springframework.scheduling.annotation.EnableAsync;
9 
import org.springframework.scheduling.annotation.EnableScheduling;
9 10
10 11 
/**
11 12 
 * @author zhangfeng
12 13 
 */
14
13 15 
@EnableJpaRepositories(basePackages = "com.ai.bss")
14 16 
@EntityScan(basePackages = {"com.ai.bss","com.ai.abc"})
15 17 
@ComponentScan(basePackages = {"com.ai.bss","com.ai.abc"})

+ 84 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/controller/AttendanceCommonController.java
View File 

@ -0,0 +1,84 @@
1 
package com.ai.bss.security.protection.controller;
2
3
4 
import com.ai.abc.api.model.CommonRequest;
5 
import com.ai.abc.api.model.CommonResponse;
6 
import com.ai.bss.components.common.model.PageBean;
7 
import com.ai.bss.person.model.Organization;
8 
import com.ai.bss.security.protection.service.interfaces.AttendanceCommonService;
9 
import com.ai.bss.user.dto.UserDto;
10 
import org.springframework.beans.factory.annotation.Autowired;
11 
import org.springframework.stereotype.Controller;
12 
import org.springframework.web.bind.annotation.RequestBody;
13 
import org.springframework.web.bind.annotation.RequestMapping;
14 
import org.springframework.web.bind.annotation.ResponseBody;
15
16 
import java.util.List;
17 
import java.util.Map;
18
19 
/**
20 
 * 公共服务，包括部门、用户
21 
 * @Auth wangdong
22 
 */
23 
@Controller
24 
@RequestMapping("/workEmployee")
25 
public class AttendanceCommonController {
26
27 
    @Autowired
28 
    AttendanceCommonService attendanceCommonService;
29
30 
    /**
31 
     * 查询部门列表
32 
     */
33 
    @ResponseBody
34 
    @RequestMapping("/queryAllOrganize")
35 
    public CommonResponse<List<Organization>> queryAllOrganize(@RequestBody Map<String, Object> params)  {
36 
        return attendanceCommonService.queryAllOrganize(params);
37 
    }
38
39 
//    /**
40 
//     * 分页查询所有员工信息
41 
//     */
42 
//    @ResponseBody
43 
//    @RequestMapping("/queryWorkEmployee")
44 
//    public CommonResponse<PageBean<UserDto>> queryWorkEmployee(@RequestBody(required = false) Map<String, Object> params)  {
45 
//
46 
//        return attendanceCommonService.queryWorkEmployee(params);
47 
//    }
48
49 
    /**
50 
     * 分页查询用户信息
51 
     */
52 
    @ResponseBody
53 
    @RequestMapping("/queryWorkEmployee")
54 
    public CommonResponse<PageBean<UserDto>> queryWorkEmployee(@RequestBody CommonRequest<UserDto> request) throws Exception {
55 
		/*UserDto userDto = new UserDto();
56 
		userDto.setOrgId(params.get("orgId"));
57 
		userDto.setCode(params.get("code"));
58 
		userDto.setName(params.get("name"));
59 
		// TODO 组织编码
60 
		userDto.setOrgCode("0000");
61
62 
		// 当前页数
63 
		int pageNumber  = Integer.parseInt(params.get("pageNumber"));
64 
		// 每页条数
65 
		int pageSize = Integer.parseInt(params.get("pageSize"));
66
67 
		CommonRequest<UserDto> request=new CommonRequest<UserDto>(userDto, pageNumber, pageSize);
68 
*/
69 
        //CommonRequest<UserDto> request = CommonRequest.<UserDto>builder().data(userDto).pageNumber(pageNum).pageSize(pageSize).build();
70
71 
        return attendanceCommonService.queryWorkEmployee(request);
72 
    }
73
74
75 
    /**
76 
     * 查询部门下员工
77 
     */
78 
    @ResponseBody
79 
    @RequestMapping("/queryEmployeeByOrg")
80 
    public CommonResponse<List<UserDto>> queryEmployeeByOrg(@RequestBody Map<String, Object> params)  {
81
82 
        return attendanceCommonService.queryEmployeeByOrg(params);
83 
    }
84 
}

+ 22 - 3
security-protection-service/src/main/java/com/ai/bss/security/protection/controller/attendanceRulesController.java
View File 

@ -1,11 +1,15 @@
1 1 
package com.ai.bss.security.protection.controller;
2 2
3 
import com.ai.abc.api.model.CommonResponse;
3 4 
import com.ai.bss.security.protection.service.interfaces.AreaInRecordService;
5 
import com.ai.bss.security.protection.service.interfaces.AttendanceRulesService;
6 
import com.ai.bss.work.attendance.service.api.inparam.AttendanceRuleParams;
4 7 
import com.github.pagehelper.PageInfo;
5 8 
import org.slf4j.Logger;
6 9 
import org.slf4j.LoggerFactory;
7 10 
import org.springframework.beans.factory.annotation.Autowired;
8 11 
import org.springframework.stereotype.Controller;
12 
import org.springframework.web.bind.annotation.RequestBody;
9 13 
import org.springframework.web.bind.annotation.RequestMapping;
10 14 
import org.springframework.web.bind.annotation.ResponseBody;
11 15 
@ -14,15 +18,18 @@ import java.util.Map;
14 18
15 19 
/**
16 20 
 * 考勤规则
21 
 * @Auth wangdong
17 22 
 */
18 23 
@Controller
19 24 
@RequestMapping("/attendanceRules")
20 
public class attendanceRulesController {
21 
	Logger logger = LoggerFactory.getLogger(attendanceRulesController.class);
25 
public class AttendanceRulesController {
22 26
23 27 
	@Autowired
24 28 
	AreaInRecordService areaInRecordService;
25 29
30 
	@Autowired
31 
	AttendanceRulesService attendanceRulesService;
32
26 33 
	/**
27 34 
	 * 分页查询考勤统计分析
28 35 
	 */
 
@ -39,8 +46,20 @@ public class attendanceRulesController {
39 46 
		}
40 47 
		PageInfo pageInfo = areaInRecordService.queryPageAttendanceCount(params, pageNum, pageSize);
41 48
42
43 49 
		return pageInfo;
44 50
45 51 
	}
52
53 
	/**
54 
	 * 创建考勤规则
55 
	 * @param attendanceRuleParams
56 
	 * @return
57 
	 * @throws Exception
58 
	 */
59 
	@ResponseBody
60 
	@RequestMapping("/createAttendanceRule")
61 
	public CommonResponse createAttendanceRule(@RequestBody AttendanceRuleParams attendanceRuleParams) throws Exception {
62
63 
		return attendanceRulesService.createAttendanceRule(attendanceRuleParams);
64 
	}
46 65 
}

+ 75 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/controller/WorkShiftController.java
View File 

@ -0,0 +1,75 @@
1 
package com.ai.bss.security.protection.controller;
2
3 
import com.ai.abc.api.model.CommonRequest;
4 
import com.ai.abc.api.model.CommonResponse;
5 
import com.ai.bss.security.protection.service.interfaces.WorkShiftService;
6 
import com.ai.bss.work.task.model.common.WorkShift;
7 
import org.springframework.beans.factory.annotation.Autowired;
8 
import org.springframework.stereotype.Controller;
9 
import org.springframework.web.bind.annotation.RequestBody;
10 
import org.springframework.web.bind.annotation.RequestMapping;
11 
import org.springframework.web.bind.annotation.ResponseBody;
12
13 
import java.util.Map;
14
15 
@Controller
16 
@RequestMapping("/workShift")
17 
public class WorkShiftController {
18
19
20 
    @Autowired
21 
    private WorkShiftService workShiftService;
22
23 
    /**
24 
     * 创建班次
25 
     * @param workShift
26 
     * @return
27 
     * @throws Exception
28 
     */
29 
    @ResponseBody
30 
    @RequestMapping("/createWorkShift")
31 
    public CommonResponse createWorkShift(@RequestBody WorkShift workShift) throws Exception {
32
33 
         workShiftService.createWorkShift(workShift);
34 
        return CommonResponse.OK_VOID;
35 
    }
36
37 
    /**
38 
     * 修改班次
39 
     * @param workShift
40 
     * @return
41 
     * @throws Exception
42 
     */
43 
    @ResponseBody
44 
    @RequestMapping("/modifyWorkShift")
45 
    public CommonResponse modifyWorkShift(@RequestBody WorkShift workShift) throws Exception {
46
47 
        return workShiftService.modifyWorkShift(workShift);
48 
    }
49
50 
    /**
51 
     * 删除班次
52 
     * @param workShift
53 
     * @return
54 
     * @throws Exception
55 
     */
56 
    @ResponseBody
57 
    @RequestMapping("/deleteWorkShift")
58 
    public CommonResponse deleteWorkShift(@RequestBody WorkShift workShift) throws Exception {
59
60 
        return workShiftService.deleteWorkShift(workShift);
61 
    }
62
63 
    /**
64 
     * 查询班次列表
65 
     * @param conditionMapRequest
66 
     * @return
67 
     * @throws Exception
68 
     */
69 
    @ResponseBody
70 
    @RequestMapping("/queryWorkShiftForPage")
71 
    public CommonResponse queryWorkShiftForPage(@RequestBody CommonRequest<Map<String, Object>> conditionMapRequest) throws Exception {
72
73 
        return workShiftService.queryWorkShiftForPage(conditionMapRequest);
74 
    }
75 
}

+ 90 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AttendanceCommonServiceImpl.java
View File 

@ -0,0 +1,90 @@
1 
package com.ai.bss.security.protection.service.impl;
2
3 
import com.ai.abc.api.model.CommonRequest;
4 
import com.ai.abc.api.model.CommonResponse;
5 
import com.ai.bss.components.common.constant.CommonConstant;
6 
import com.ai.bss.components.common.model.PageBean;
7 
import com.ai.bss.person.model.Organization;
8 
import com.ai.bss.person.service.api.OrganizationQuery;
9 
import com.ai.bss.security.protection.service.interfaces.AttendanceCommonService;
10 
import com.ai.bss.user.dto.UserDto;
11 
import com.ai.bss.user.service.api.EmployeeService;
12 
import com.ai.bss.user.service.api.UserDtoQuery;
13 
import lombok.extern.slf4j.Slf4j;
14 
import org.springframework.beans.factory.annotation.Autowired;
15 
import org.springframework.stereotype.Service;
16
17 
import java.util.List;
18 
import java.util.Map;
19
20 
@Slf4j
21 
@Service
22 
public class AttendanceCommonServiceImpl implements AttendanceCommonService {
23
24 
    @Autowired
25 
    private UserDtoQuery userDtoQuery;
26
27 
    @Autowired
28 
    private OrganizationQuery organizationQuery;
29
30 
    @Autowired
31 
    private EmployeeService employeeService;
32
33 
    @Override
34 
    public CommonResponse<PageBean<UserDto>> queryWorkEmployee(Map<String, Object> params)  {
35 
        String orgCode = (!(params.get("orgCode") == null || "".equals(params.get("orgCode")))) ? (String) params.get("orgCode") : null;
36 
        String orgId = (!(params.get("orgId") == null || "".equals(params.get("orgId")))) ? (String) params.get("orgId") : null;
37 
        String employeeId = (!(params.get("employeeId") == null || "".equals(params.get("employeeId")))) ? (String) params.get("employeeId") : null;
38 
        String employeeName = (!(params.get("employeeName") == null || "".equals(params.get("employeeName")))) ? (String) params.get("employeeName") : null;
39 
        String employeeCode = (!(params.get("employeeCode") == null || "".equals(params.get("employeeCode")))) ? (String) params.get("employeeCode") : null;
40
41 
        UserDto userDto = new UserDto();
42 
        userDto.setOrgCode(orgCode);
43 
        userDto.setOrgId(orgId);
44 
        userDto.setId(employeeId);
45 
        userDto.setName(employeeName);
46 
        userDto.setCode(employeeCode);
47
48 
        CommonRequest<UserDto> request2=new CommonRequest<UserDto>(userDto);
49 
        return userDtoQuery.queryWorkEmployee(request2);
50 
    }
51
52 
    @Override
53 
    public CommonResponse<PageBean<UserDto>> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception {
54 
        // TODO 组织编码
55 
        //request.getData().setOrgCode("0000");
56 
        return userDtoQuery.queryWorkEmployee(request);
57 
    }
58
59 
    @Override
60 
    public CommonResponse<List<Organization>> queryAllOrganize(Map<String, Object> params) {
61 
        Organization organize = new Organization();
62 
        //1：只查有效的；0：查全部的
63 
        organize.setDataStatus(CommonConstant.STATUS_NORMAL_STR);
64
65 
        String orgName = (!(params.get("name") == null || "".equals(params.get("name")))) ? (String) params.get("name") : null;
66
67 
        organize.setName(orgName);
68 
        CommonRequest<Organization> commonRequest = CommonRequest.<Organization>builder().data(organize).build();
69 
        return organizationQuery.queryAllOrganize(commonRequest);
70 
    }
71
72 
    @Override
73 
    public CommonResponse<List<UserDto>> queryEmployeeByOrg(Map<String, Object> params)  {
74
75 
        UserDto userDto = new UserDto();
76 
        String username = (!(params.get("name") == null || "".equals(params.get("name")))) ? (String) params.get("name") : null;
77 
        String orgId = (!(params.get("orgId") == null || "".equals(params.get("orgId")))) ? (String) params.get("orgId") : null;
78 
        String orgCode = (!(params.get("orgCode") == null || "".equals(params.get("orgCode")))) ? (String) params.get("orgCode") : null;
79 
//        int pageNumber = (!(params.get("pageNumber") == null || "".equals(params.get("pageNumber")))) ? (Integer) params.get("pageNumber") : 1;
80 
//        int pageSize = (!(params.get("pageSize") == null || "".equals(params.get("pageSize")))) ? (Integer) params.get("pageSize") : 10;
81 
        userDto.setName(username);
82 
        userDto.setOrgId(orgId);
83 
        userDto.setOrgCode(orgCode);
84 
//        CommonRequest<UserDto> request = CommonRequest.<UserDto>builder().data(userDto).pageNumber(pageNumber).pageSize(pageSize).build();
85 
        CommonRequest<UserDto> request = CommonRequest.<UserDto>builder().data(userDto).build();
86
87 
        return userDtoQuery.queryWorkEmployeeByOrg(request);
88 
    }
89
90 
}

+ 55 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AttendanceRulesServiceImpl.java
View File 

@ -0,0 +1,55 @@
1 
package com.ai.bss.security.protection.service.impl;
2
3 
import com.ai.abc.api.model.CommonRequest;
4 
import com.ai.abc.api.model.CommonResponse;
5 
import com.ai.bss.components.common.util.JsonUtils;
6 
import com.ai.bss.security.protection.service.interfaces.AttendanceRulesService;
7 
import com.ai.bss.work.attendance.service.api.AttendanceCommand;
8 
import com.ai.bss.work.attendance.service.api.inparam.AttendanceRuleParams;
9 
import lombok.extern.slf4j.Slf4j;
10 
import org.springframework.beans.factory.annotation.Autowired;
11 
import org.springframework.stereotype.Service;
12
13 
@Slf4j
14 
@Service
15 
public class AttendanceRulesServiceImpl implements AttendanceRulesService {
16
17 
    @Autowired
18 
    AttendanceCommand attendanceCommand;
19
20
21 
    @Override
22 
    public CommonResponse createAttendanceRule(AttendanceRuleParams attendanceRuleParams) throws Exception {
23
24 
//        AttendanceRuleParams
25 
//        "attendanceTaskSpec":{
26 
//            "goToWorkAheadMinutes": 60,
27 
//                    "goToWorkPostponeMinutes": 20,
28 
//                    "goToWorkDeadLine": 60,
29 
//                    "goOffWorkAheadMinutes": 60,
30 
//                    "goOffWorkPostponeMinutes": 10,
31 
//                    "g0OffWorkDeadLine": 30,
32 
//                    "allowFieldClocking": "0",
33 
//                    "lateAlarmThreshold": 5,
34 
//                    "earlyExitAlarmThreshold": 5,
35 
//                    "absentAlarmThreshold": 3,
36 
//                    "workTaskSpecId": "",
37 
//                    "workTaskSpecTypeId": "CLOCKING",
38 
//                    "name": "打卡",
39 
//                    "charValueSet": "{}"
40 
//        },
41 
//        "workTaskSpecPlan":{
42 
//            "workOrgRoleId": "1",
43 
//            "planMemo": "测试计划",
44 
//            "planCycleType": "NAT_MON",
45 
//            "workShiftId": 0
46 
//        }
47
48
49
50 
        CommonResponse runningResult =  attendanceCommand.createAttendanceRule(new CommonRequest<>(attendanceRuleParams));
51 
//        return runningResult;
52 
        log.info("runningResult: \n{}", JsonUtils.toJSONStringByDateFormat(runningResult, true));
53 
        return runningResult;
54 
    }
55 
}

+ 92 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/WorkShiftServiceImpl.java
View File 

@ -0,0 +1,92 @@
1 
package com.ai.bss.security.protection.service.impl;
2
3 
import com.ai.abc.api.model.CommonRequest;
4 
import com.ai.abc.api.model.CommonResponse;
5 
import com.ai.bss.components.common.util.JsonUtils;
6 
import com.ai.bss.security.protection.service.interfaces.WorkShiftService;
7 
import com.ai.bss.work.service.api.WorkShiftCommand;
8 
import com.ai.bss.work.service.api.WorkShiftQuery;
9 
import com.ai.bss.work.task.model.common.WorkShift;
10 
import com.alibaba.fastjson.JSON;
11 
import com.alibaba.fastjson.serializer.SerializerFeature;
12 
import lombok.extern.slf4j.Slf4j;
13 
import org.springframework.beans.factory.annotation.Autowired;
14 
import org.springframework.stereotype.Service;
15
16 
import java.util.ArrayList;
17 
import java.util.List;
18 
import java.util.Map;
19
20 
@Slf4j
21 
@Service
22 
public class WorkShiftServiceImpl implements WorkShiftService {
23
24 
//    @Autowired
25 
//    AttendanceCommand attendanceCommand;
26
27 
    @Autowired
28 
    WorkShiftCommand workShiftCommand;
29
30 
    @Autowired
31 
    WorkShiftQuery workShiftQuery;
32
33
34 
    @Override
35 
    public CommonResponse createWorkShift(WorkShift workShift) throws Exception {
36
37 
        CommonRequest<WorkShift> requestWorkShift = new CommonRequest(workShift);
38 
        log.info("requestWorkShift: \n{}", JSON.toJSONString(requestWorkShift, true));
39 
        CommonResponse runningResult = workShiftCommand.createWorkShift(requestWorkShift);
40 
        log.info("runningResult: \n{}", JsonUtils.toJSONStringByDateFormat(runningResult, true));
41 
        return runningResult;
42 
    }
43
44 
    @Override
45 
    public CommonResponse modifyWorkShift(WorkShift workShift) throws Exception {
46
47 
        CommonRequest<WorkShift> requestWorkShift = new CommonRequest(workShift);
48 
        log.info("requestWorkShift: \n{}", JSON.toJSONString(requestWorkShift, true));
49 
        CommonResponse runningResult = workShiftCommand.modifyWorkShift(requestWorkShift);
50 
        log.info("runningResult: \n{}", JsonUtils.toJSONStringByDateFormat(runningResult, true));
51 
        return runningResult;
52 
    }
53
54 
    @Override
55 
    public CommonResponse deleteWorkShift(WorkShift workShift) throws Exception {
56
57 
        if(workShift == null || workShift.getWorkShiftId()==null){
58 
            throw new Exception("WorkShiftId be not null!");
59 
        }
60 
        List<Long> WorkShiftIdList = new ArrayList<>();
61 
        WorkShiftIdList.add(workShift.getWorkShiftId());
62
63 
        CommonRequest<List<Long>> workShiftRequest = new CommonRequest(WorkShiftIdList);
64 
        log.info("requestWorkShift: \n{}", JSON.toJSONString(workShiftRequest, true));
65 
        CommonResponse runningResult = workShiftCommand.deleteWorkShift(workShiftRequest);
66 
        log.info("runningResult: \n{}", JsonUtils.toJSONStringByDateFormat(runningResult, true));
67
68
69
70
71 
        return runningResult;
72 
    }
73
74 
    @Override
75 
    public CommonResponse<List<WorkShift>> queryWorkShiftForPage(CommonRequest<Map<String, Object>> conditionMapRequest) {
76
77 
//        String orgId = (!(params.get("orgId") == null || "".equals(params.get("orgId")))) ? (String) params.get("orgId") : null;
78
79 
        log.info("requestWorkShift: \n{}", JSON.toJSONString(conditionMapRequest, true));
80
81 
        return null;// workShiftQuery.queryWorkShift(new CommonRequest<>(null));
82 
    }
83
84 
    public static String toJSONStringByDateFormat(Object object, boolean perttyFormat) {
85 
        JSON.DEFFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
86 
        if (perttyFormat) {
87 
            return JSON.toJSONString(object, SerializerFeature.WriteDateUseDateFormat, SerializerFeature.PrettyFormat);
88 
        } else {
89 
            return JSON.toJSONString(object, SerializerFeature.WriteDateUseDateFormat);
90 
        }
91 
    }
92 
}

+ 44 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/AttendanceCommonService.java
View File 

@ -0,0 +1,44 @@
1 
package com.ai.bss.security.protection.service.interfaces;
2
3 
import com.ai.abc.api.model.CommonRequest;
4 
import com.ai.abc.api.model.CommonResponse;
5 
import com.ai.bss.components.common.model.PageBean;
6 
import com.ai.bss.person.model.Organization;
7 
import com.ai.bss.user.dto.UserDto;
8
9 
import java.util.List;
10 
import java.util.Map;
11
12 
public interface AttendanceCommonService {
13 
    /**
14 
     * 人员列表分页查询
15 
     * @param request
16 
     * @return
17 
     * @throws Exception
18 
     */
19 
    CommonResponse<PageBean<UserDto>> queryWorkEmployee(Map<String, Object> params) ;
20
21
22
23 
    /**
24 
     * 人员列表分页查询
25 
     * @param request
26 
     * @return
27 
     * @throws Exception
28 
     */
29 
    CommonResponse<PageBean<UserDto>> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception;
30
31 
    /**
32 
     * 查询所有部门（课通过name过滤）
33 
     * @param params{"name":""}
34 
     * @return
35 
     */
36 
    CommonResponse<List<Organization>> queryAllOrganize(Map<String, Object> params);
37
38 
    /**
39 
     * 根据orgId查询该部门下员工(可同时支持员工姓名过滤)
40 
     * @param params{"orgId":"","name":""}
41 
     * @return
42 
     */
43 
    CommonResponse<List<UserDto>> queryEmployeeByOrg(Map<String, Object> params);
44 
}

+ 9 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/AttendanceRulesService.java
View File 

@ -0,0 +1,9 @@
1 
package com.ai.bss.security.protection.service.interfaces;
2
3 
import com.ai.abc.api.model.CommonResponse;
4 
import com.ai.bss.work.attendance.service.api.inparam.AttendanceRuleParams;
5
6 
public interface AttendanceRulesService {
7
8 
    CommonResponse createAttendanceRule(AttendanceRuleParams attendanceRuleParams) throws Exception;
9 
}

+ 44 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/WorkShiftService.java
View File 

@ -0,0 +1,44 @@
1 
package com.ai.bss.security.protection.service.interfaces;
2
3 
import com.ai.abc.api.model.CommonRequest;
4 
import com.ai.abc.api.model.CommonResponse;
5 
import com.ai.bss.work.attendance.service.api.inparam.AttendanceRuleParams;
6 
import com.ai.bss.work.task.model.common.WorkShift;
7
8 
import java.util.List;
9 
import java.util.Map;
10
11 
public interface WorkShiftService {
12
13 
    /**
14 
     * 创建班次
15 
     * @param workShift
16 
     * @return
17 
     * @throws Exception
18 
     */
19 
    CommonResponse createWorkShift(WorkShift workShift) throws Exception;
20
21 
    /**
22 
     * 修改班次
23 
     * @param workShift
24 
     * @return
25 
     * @throws Exception
26 
     */
27 
    CommonResponse modifyWorkShift(WorkShift workShift) throws Exception;
28
29 
    /**
30 
     * 删除班次
31 
     * @param workShift
32 
     * @return
33 
     * @throws Exception
34 
     */
35 
    CommonResponse deleteWorkShift(WorkShift workShift) throws Exception;
36
37
38 
    /**
39 
     * 查询班次信息
40 
     * @param conditionMapRequest
41 
     * @return
42 
     */
43 
    CommonResponse<List<WorkShift>> queryWorkShiftForPage(CommonRequest<Map<String, Object>> conditionMapRequest);
44 
}

+ 19 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/utils/SecurityConfigSEVEN.java
View File 

@ -0,0 +1,19 @@
1 
//package com.ai.bss.security.protection.utils;
2 
//
3 
//import org.springframework.context.annotation.Configuration;
4 
//import org.springframework.security.config.annotation.web.builders.HttpSecurity;
5 
//import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
6 
//import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
7 
//
8 
//@Configuration
9 
//@EnableWebSecurity
10 
//public class SecurityConfigSEVEN extends WebSecurityConfigurerAdapter {
11 
//
12 
//    @Override
13 
//    protected void configure(HttpSecurity http) throws Exception {
14 
//        //super.configure(http);
15 
//        //配置不需要登陆验证
16 
//        http.authorizeRequests().anyRequest().permitAll().and().logout().permitAll();
17 
//    }
18 
//}
19 
//

+ 34 - 6
security-protection-service/src/main/resources/application.properties
View File 

@ -1,12 +1,14 @@
1 1 
spring.application.name=WorkTaskSpec
2 
server.port=8086
2 
server.port=8018
3
4 
server.servlet.context-path=/sp
3 5
4 6 
# DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
5 7 
#spring.datasource.url=jdbc:mysql://localhost:3306/cmp
6 
spring.datasource.url=jdbc:mysql://10.11.20.120:3306/common_frm?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&verifyServerCertificate=false&useSSL=false&requireSSL=false
8 
spring.datasource.url=jdbc:mysql://10.19.90.34:3307/energy?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&verifyServerCertificate=false&useSSL=false&requireSSL=false
7 9 
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
8 
spring.datasource.username=comon_frm
9 
spring.datasource.password=1qaz@WSX
10 
spring.datasource.username=ebc
11 
spring.datasource.password=ebc@123
10 12
11 13 
# JPA (JpaBaseConfiguration, HibernateJpaAutoConfiguration)
12 14 
#spring.jpa.database=default
 
@ -17,10 +19,36 @@ spring.jpa.properties.hibernate.format_sql=true
17 19 
spring.jpa.properties.hibernate.generate_statistics=false
18 20 
spring.main.allow-bean-definition-overriding=true
19 21
22 
#kafka
23 
kafka.bootstrap-servers=47.105.160.21:9090
24 
#kafka.bootstrap-servers=10.19.90.34:2182
25 
#kafka.topic.deviceLocation=Topic_IoT_DeviceLocation
26 
#kafka.topic.alarm=Topic_IoT_IndividualAlarm
27 
kafka.topic.deviceLocation=DeviceLocationA
28 
kafka.topic.alarm=IndividualAlarmA
29 
kafka.producer.batch-size=16785
30 
kafka.producer.retries=1
31 
kafka.producer.buffer-memory=33554432
32 
kafka.producer.linger=1
33 
kafka.consumer.auto-offset-reset=latest
34 
kafka.consumer.max-poll-records=3100
35 
kafka.consumer.enable-auto-commit=false
36 
kafka.consumer.auto-commit-interval=1000
37 
kafka.consumer.session-timeout=20000
38 
kafka.consumer.max-poll-interval=15000
39 
kafka.consumer.max-partition-fetch-bytes=15728640
40 
kafka.listener.batch-listener=false
41 
kafka.listener.concurrencys=3,6
42 
kafka.listener.poll-timeout=1500
43
44
20 45 
# CACHE
21 46 
#spring.cache.type=ehcache
22 47 
#spring.cache.ehcache.config=ehcache.xml
23 48
24 49 
# LOGGING
25 
logging.level.com.ai=info
26 
logging.level.org.springframework.data=info
50 
logging.level.com.ai=debug
51 
logging.level.org.springframework.data=debug
52
53 
# \u5f15\u5165gis\u548ciot\u7684\u914d\u7f6e\u6587\u4ef6
54 
spring.profiles.active=iot,gis